From 0f49d95f9975a41371e1f82e1d3df5e22fe5e967 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 14 Feb 2014 16:01:51 +0000 Subject: [PATCH] Dev: Update demo css and js for Editor 1.10 integration --- .datatables-commit-sync | 2 +- examples/resources/demo.css | 5 +++++ examples/resources/demo.js | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 1e99f71e..583a5571 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -19a4f46a4f58fd7d24197f3ab6b550a4fd29dcae +1bd3ec37ec56c8981abf7af3802eab19b5ab980c diff --git a/examples/resources/demo.css b/examples/resources/demo.css index b8d17396..e83e2223 100644 --- a/examples/resources/demo.css +++ b/examples/resources/demo.css @@ -282,3 +282,8 @@ div.tabs>div h1 { margin-top: 1em; } +div.column_half { + float: left; + width: 49%; + padding-right: 1%; +} diff --git a/examples/resources/demo.js b/examples/resources/demo.js index 2c98e9dc..7ca11a8e 100644 --- a/examples/resources/demo.js +++ b/examples/resources/demo.js @@ -72,7 +72,7 @@ $(document).ready( function () { // php var phpTab = $('ul.tabs li').eq(4).css('display', 'none'); - $(document).on( 'init.dt', function ( e, settings ) { + $(document).on( 'init.dt.demoSSP', function ( e, settings ) { if ( settings.oFeatures.bServerSide ) { if ( $.isFunction( settings.ajax ) ) { return; @@ -101,7 +101,7 @@ $(document).ready( function () { } // Tabs - $('ul.tabs li').click( function () { + $('ul.tabs').on( 'click', 'li', function () { $('ul.tabs li.active').removeClass('active'); $(this).addClass('active');