From ea0121f5c1fc510e5fce9c6ff3eee25245e4b07b Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 17 Sep 2015 15:09:50 -0400 Subject: [PATCH] Cleanup and capitalisation for the Table widget --- airtime_mvc/public/js/airtime/library/library.js | 10 +++++----- airtime_mvc/public/js/airtime/widgets/table-example.js | 10 +++++----- airtime_mvc/public/js/airtime/widgets/table.js | 6 +----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 9d7286bae..c5e998144 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1249,13 +1249,13 @@ var AIRTIME = (function(AIRTIME) { ]; var ajaxSourceURL = baseUrl+"rest/podcast"; - var podcastTolbarButtons = AIRTIME.widgets.table.getStandardToolbarButtons(); - podcastTolbarButtons[AIRTIME.widgets.table.TOOLBAR_BUTTON_ROLES.NEW].eventHandlers.click = function(e) { alert('New!'); }; - podcastTolbarButtons[AIRTIME.widgets.table.TOOLBAR_BUTTON_ROLES.EDIT].eventHandlers.click = function(e) { alert('Edit!'); }; - podcastTolbarButtons[AIRTIME.widgets.table.TOOLBAR_BUTTON_ROLES.DELETE].eventHandlers.click = function(e) { alert('Delete!'); }; + var podcastTolbarButtons = AIRTIME.widgets.Table.getStandardToolbarButtons(); + podcastTolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.NEW].eventHandlers.click = function(e) { alert('New!'); }; + podcastTolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT].eventHandlers.click = function(e) { alert('Edit!'); }; + podcastTolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE].eventHandlers.click = function(e) { alert('Delete!'); }; //Set up the div with id "podcast_table" as a datatable. - mod.podcastDataTable = new AIRTIME.widgets.table( + mod.podcastDataTable = new AIRTIME.widgets.Table( $('#podcast_table'), //DOM node to create the table inside. true, //Enable item selection podcastTolbarButtons, //Toolbar buttons diff --git a/airtime_mvc/public/js/airtime/widgets/table-example.js b/airtime_mvc/public/js/airtime/widgets/table-example.js index 0e3efa745..800416e81 100644 --- a/airtime_mvc/public/js/airtime/widgets/table-example.js +++ b/airtime_mvc/public/js/airtime/widgets/table-example.js @@ -13,14 +13,14 @@ $(document).ready(function() { ]; var ajaxSourceURL = baseUrl+"rest/media"; - var myToolbarButtons = AIRTIME.widgets.table.getStandardToolbarButtons(); - myToolbarButtons[AIRTIME.widgets.table.TOOLBAR_BUTTON_ROLES.NEW].eventHandlers.click = function(e) { alert('New!'); }; - myToolbarButtons[AIRTIME.widgets.table.TOOLBAR_BUTTON_ROLES.EDIT].eventHandlers.click = function(e) { alert('Edit!'); }; - myToolbarButtons[AIRTIME.widgets.table.TOOLBAR_BUTTON_ROLES.DELETE].eventHandlers.click = function(e) { alert('Delete!'); }; + var myToolbarButtons = AIRTIME.widgets.Table.getStandardToolbarButtons(); + myToolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.NEW].eventHandlers.click = function(e) { alert('New!'); }; + myToolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT].eventHandlers.click = function(e) { alert('Edit!'); }; + myToolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE].eventHandlers.click = function(e) { alert('Delete!'); }; //Set up the div with id "example-table" as a datatable. - var table = new AIRTIME.widgets.table( + var table = new AIRTIME.widgets.Table( $('#example-table'), //DOM node to create the table inside. true, //Enable item selection myToolbarButtons, //Toolbar buttons diff --git a/airtime_mvc/public/js/airtime/widgets/table.js b/airtime_mvc/public/js/airtime/widgets/table.js index 917c09116..667b7f7db 100644 --- a/airtime_mvc/public/js/airtime/widgets/table.js +++ b/airtime_mvc/public/js/airtime/widgets/table.js @@ -9,10 +9,6 @@ var AIRTIME = (function(AIRTIME) { AIRTIME.widgets = {}; } - /*if (AIRTIME.widgets.table === undefined) { - AIRTIME.widgets.table = {}; - }*/ - var HUGE_INT = Math.pow(2, 53) - 1; //Table widget constructor @@ -440,7 +436,7 @@ var AIRTIME = (function(AIRTIME) { }; //Add Table to the widgets namespace - AIRTIME.widgets.table = Table; + AIRTIME.widgets.Table = Table; return AIRTIME;