Merge branch 'slapjs' of http://git.erp5.org/repos/slapos.core into slapjs

bbabfa06 · Thomas Lechauve · 72511093 · 7a3fb3f7 · bbabfa06 · bbabfa06
Commit bbabfa06 authored Jun 27, 2012 by Thomas Lechauve
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 13 deletions

vifib/index.html vifib/index.html +1 -5

vifib/static/js/core.js vifib/static/js/core.js +0 -8

vifib/static/js/jqm-config.js vifib/static/js/jqm-config.js +13 -0

No files found.
--- a/vifib/index.html
+++ b/vifib/index.html
@@ -322,10 +322,6 @@
        </div>
    </script>

-    <script id="root" type="text/html">
-        <div data-role="page" data-theme="c"></div>
-    </script>
-
    <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
    <script type="text/javascript" src="static/js/ICanHaz.min.js"></script>
    <script type="text/javascript" src="static/js/swipe.min.js"></script>
@@ -334,10 +330,10 @@
    <script type="text/javascript" src="static/js/jquery.slapos.js"></script>
    <script type="text/javascript" src="static/js/jquery.urljs.js"></script>
    <script type="text/javascript" src="static/js/fake.js"></script>
+    <script type="text/javascript" src="static/js/jqm-config.js"></script>
    <script type="text/javascript" src="static/js/core.js"></script>
    <script src="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.js"></script>
 </head>
 <body>
-        <div data-role="page" data-theme="c"></div>
 </body>
 </html>
--- a/vifib/static/js/core.js
+++ b/vifib/static/js/core.js
@@ -676,14 +676,6 @@
    };
 }(jQuery));

-$(document).bind("mobileinit", function(){
-    // let's handle ourself the hashchange event
-    $.mobile.hashListeningEnabled = false;
-    $.mobile.pushStateEnabled = false;
-    $.mobile.ajaxEnabled = false;
-    $.mobile.linkBindingEnabled = false;
-    $.mobile.defaultPageTransition = 'none';
-});
 $(document).bind('pagecreate', function () {
    $('body').vifib();
 });

--- a/vifib/static/js/jqm-config.js
+++ b/vifib/static/js/jqm-config.js
+$(document).bind("mobileinit", function () {
+    $.mobile.ajaxEnabled = false;
+    $.mobile.linkBindingEnabled = false;
+    $.mobile.hashListeningEnabled = false;
+    $.mobile.pushStateEnabled = false;
+    // Disable transition
+//     $.mobile.defaultPageTransition = 'none';
+
+    // Remove page from DOM when it's being replaced
+    $('div[data-role="page"]').live('pagehide', function (event, ui) {
+        $(event.currentTarget).remove();
+    });
+});