Fixed issue #11. Updated code structure.

mazong1123 · Jul 30, 2016 · 2bbd942 · 2bbd942
1 parent d1ba6ab
commit 2bbd942
Show file tree

Hide file tree

Showing 29 changed files with 143 additions and 83 deletions.
diff --git a/dist/css/ratchetPro-theme-android.css b/dist/css/ratchetPro-theme-android.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/dist/css/ratchetPro-theme-android.min.css b/dist/css/ratchetPro-theme-android.min.css
diff --git a/dist/css/ratchetPro-theme-ios.css b/dist/css/ratchetPro-theme-ios.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/dist/css/ratchetPro-theme-ios.min.css b/dist/css/ratchetPro-theme-ios.min.css
diff --git a/dist/css/ratchetPro.css b/dist/css/ratchetPro.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/dist/css/ratchetPro.min.css b/dist/css/ratchetPro.min.css
diff --git a/dist/js/ratchetPro.js b/dist/js/ratchetPro.js
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.
@@ -1654,26 +1654,30 @@
         init: function () {
             var self = this;
 
+            self.isRatchetPageChangingReady = false;
+
             self.entryCallback = undefined;
 
             self.components = [];
 
             self.domContentLoadedCallback = function () {
-                self.populateComponents();
+                if (self.isRatchetPageChangingReady) {
+                    // Ratchet page changing system is ready. All page changing will go
+                    // through pageContentReadyCallback routing.
+                    // We do not need to listen to the DOMContentLoaded event now.
+                    document.removeEventListener('DOMContentLoaded', self.domContentLoadedCallback);
 
-                // Dom is ready, call entryCallback().
-                if (typeof self.entryCallback === 'function') {
-                    self.entryCallback();
+                    return;
                 }
+
+                self.processAfterPageInitialized();
             };
 
             self.pageContentReadyCallback = function () {
-                self.populateComponents();
+                self.processAfterPageInitialized();
 
-                // Page changing end, page content is ready, call entryCallback();
-                if (typeof self.entryCallback === 'function') {
-                    self.entryCallback();
-                }
+                // Enter into this method means the Ratchet page changing system is ready.
+                self.isRatchetPageChangingReady = true;
             };
         },
 
@@ -1794,6 +1798,17 @@
             }
 
             window.RATCHET.Class.Pusher.push(options);
+        },
+
+        processAfterPageInitialized: function () {
+            var self = this;
+
+            self.populateComponents();
+
+            // Dom is ready, call entryCallback().
+            if (typeof self.entryCallback === 'function') {
+                self.entryCallback();
+            }
         }
     });
 

diff --git a/dist/js/ratchetPro.min.js b/dist/js/ratchetPro.min.js
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
diff --git a/docs/assets/js/docs.min.js b/docs/assets/js/docs.min.js
diff --git a/docs/dist/css/ratchetPro-theme-android.css b/docs/dist/css/ratchetPro-theme-android.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/docs/dist/css/ratchetPro-theme-android.min.css b/docs/dist/css/ratchetPro-theme-android.min.css
diff --git a/docs/dist/css/ratchetPro-theme-ios.css b/docs/dist/css/ratchetPro-theme-ios.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/docs/dist/css/ratchetPro-theme-ios.min.css b/docs/dist/css/ratchetPro-theme-ios.min.css
diff --git a/docs/dist/css/ratchetPro.css b/docs/dist/css/ratchetPro.css
@@ -1,7 +1,7 @@
 /*!
  * =============================================================
  * RatchetPro v1.0.0 (https://github.com/mazong1123/ratchet-pro)
- * Copyright 2015 mazong1123
+ * Copyright 2016 mazong1123
  * Licensed under MIT (https://github.com/mazong1123/ratchet-pro/blob/master/LICENSE)
  *
  * v1.0.0 designed by @mazong1123.

diff --git a/docs/dist/css/ratchetPro.min.css b/docs/dist/css/ratchetPro.min.css