Skip to content

S
slapos.core
Commit bbabfa06 authored by Thomas Lechauve's avatar Thomas Lechauve
Browse files
Options

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

parents 72511093 7a3fb3f7
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
vifib/index.html
View file @ bbabfa06
...@@ -322,10 +322,6 @@ ...@@ -322,10 +322,6 @@
</div> </div>
</script> </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 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/ICanHaz.min.js"></script>
<script type="text/javascript" src="static/js/swipe.min.js"></script> <script type="text/javascript" src="static/js/swipe.min.js"></script>
...@@ -334,10 +330,10 @@ ...@@ -334,10 +330,10 @@
<script type="text/javascript" src="static/js/jquery.slapos.js"></script> <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/jquery.urljs.js"></script>
<script type="text/javascript" src="static/js/fake.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 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> <script src="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.js"></script>
</head> </head>
<body> <body>
<div data-role="page" data-theme="c"></div>
</body> </body>
</html> </html>
vifib/static/js/core.js
View file @ bbabfa06
...@@ -676,14 +676,6 @@ ...@@ -676,14 +676,6 @@
}; };
}(jQuery)); }(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 () { $(document).bind('pagecreate', function () {
$('body').vifib(); $('body').vifib();
}); });
......
vifib/static/js/jqm-config.js 0 → 100644
View file @ bbabfa06
$(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();
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7