Commit 41f20ba6 authored by Thomas Lechauve's avatar Thomas Lechauve

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

parents 1470dfc0 4f3ad1e2
...@@ -63,14 +63,7 @@ ...@@ -63,14 +63,7 @@
return this.each(function () { return this.each(function () {
// JQM configuration // JQM configuration
// Initialize slapos in this context // Initialize slapos in this context
//$(this).slapos({'host': 'http://10.8.2.34:12006/erp5/portal_vifib_rest_api_v1'});
$(this).slapos({'host': 'http://10.8.2.34:12006/erp5/portal_vifib_rest_api_v1'}); $(this).slapos({'host': 'http://10.8.2.34:12006/erp5/portal_vifib_rest_api_v1'});
// Bind Loading content
//$('#loading').ajaxStart(function () {
//$(this).spin(spinOptions);
//}).ajaxStop(function () {
//$(this).spin(false);
//});
for (var level = 0; level < routes.length; level += 1) { for (var level = 0; level < routes.length; level += 1) {
for (var i = 0; i < routes[level].length; i += 1) { for (var i = 0; i < routes[level].length; i += 1) {
var r = routes[level][i]; var r = routes[level][i];
...@@ -676,9 +669,6 @@ ...@@ -676,9 +669,6 @@
}; };
}(jQuery)); }(jQuery));
$(document).bind('pagecreate', function () { $(document).ready(function () {
$('body').vifib(); $('body').vifib();
}); });
$(document).bind('pagebeforecreate', function (e, data) {
//e.preventDefault();
});
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