From 5d8da8c6bac88f51535c09411867de676dd8e99c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Thu, 26 Sep 2013 17:28:40 +0200 Subject: [PATCH] updated some fixes for the demo --- plugins/tabs/__init__.py | 19 ------------------- plugins/tabs/static/js/tabs.js | 2 +- plugins/tabs/templates/tabs.html | 12 ------------ third-party/datatables | 2 +- 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 plugins/tabs/templates/tabs.html diff --git a/plugins/tabs/__init__.py b/plugins/tabs/__init__.py index 6da94da1..e69de29b 100644 --- a/plugins/tabs/__init__.py +++ b/plugins/tabs/__init__.py @@ -1,19 +0,0 @@ -from unfold.composite import Composite - -class Tabs (Composite): - - def requirements (self): - return { 'js_files' : ['js/tabs.js', 'js/bootstrap.js'], - 'css_files' : ['css/bootstrap.css', 'css/tabs.css', ] - } - - def template_file (self): - return "tabs.html" - - # see Composite.py for the details of template_env, that exposes global - # 'sons' as a list of sons with each a set of a few attributes - def json_settings_list (self): - return [] - - def export_json_settings(self): - return True diff --git a/plugins/tabs/static/js/tabs.js b/plugins/tabs/static/js/tabs.js index b5b1cd0b..3a4e3e5b 100644 --- a/plugins/tabs/static/js/tabs.js +++ b/plugins/tabs/static/js/tabs.js @@ -2,7 +2,7 @@ $.fn.Tabs = function( method ) { - $('a[data-toggle="tab"]').on('shown', function (e) { + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { // find the plugin object inside the tab content referenced by the current tabs $('.plugin', $($(e.target).attr('href'))).trigger('show'); }); diff --git a/plugins/tabs/templates/tabs.html b/plugins/tabs/templates/tabs.html deleted file mode 100644 index 298dec92..00000000 --- a/plugins/tabs/templates/tabs.html +++ /dev/null @@ -1,12 +0,0 @@ - -
-{% for son in sons %} -
-{{ son.rendered }} -
-{% endfor %} -
diff --git a/third-party/datatables b/third-party/datatables index e657a7e3..ce40f554 120000 --- a/third-party/datatables +++ b/third-party/datatables @@ -1 +1 @@ -datatables-1.9.4/ \ No newline at end of file +datatables-1.9.4 \ No newline at end of file -- 2.47.0