From 819b57764479368bc8e8389da6085a6ce1571226 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Tue, 3 Sep 2013 12:05:06 -0400 Subject: [PATCH] Switch from dashes to underscores to keep Javascript happy - fixes #802 (also matches the style of all the other IDs) --- .../scripts/index/gdata-fusion-tables-parsing-panel.html | 4 ++-- .../gdata/module/scripts/index/gdata-parsing-panel.html | 6 +++--- .../gdata/module/scripts/index/importing-controller.js | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/gdata/module/scripts/index/gdata-fusion-tables-parsing-panel.html b/extensions/gdata/module/scripts/index/gdata-fusion-tables-parsing-panel.html index 89abae151..2e5b018f5 100644 --- a/extensions/gdata/module/scripts/index/gdata-fusion-tables-parsing-panel.html +++ b/extensions/gdata/module/scripts/index/gdata-fusion-tables-parsing-panel.html @@ -9,12 +9,12 @@
- +
- + diff --git a/extensions/gdata/module/scripts/index/gdata-parsing-panel.html b/extensions/gdata/module/scripts/index/gdata-parsing-panel.html index de1965830..223f2ff32 100644 --- a/extensions/gdata/module/scripts/index/gdata-parsing-panel.html +++ b/extensions/gdata/module/scripts/index/gdata-parsing-panel.html @@ -9,13 +9,13 @@
- +
- - + + diff --git a/extensions/gdata/module/scripts/index/importing-controller.js b/extensions/gdata/module/scripts/index/importing-controller.js index 9925bb177..870bdddd4 100644 --- a/extensions/gdata/module/scripts/index/importing-controller.js +++ b/extensions/gdata/module/scripts/index/importing-controller.js @@ -166,7 +166,7 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() { this._parsingPanelElmts = DOM.bind(this._parsingPanel); if(this._doc.type != 'table'){ - this._parsingPanelElmts.gdata-worksheet.html($.i18n._('gdata-parsing')["worksheet"]); + this._parsingPanelElmts.gdata_worksheet.html($.i18n._('gdata-parsing')["worksheet"]); this._parsingPanelElmts.gdata_ignore_first.html($.i18n._('gdata-parsing')["ignore-first"]); this._parsingPanelElmts.gdata_ignore.html($.i18n._('gdata-parsing')["ignore"]); this._parsingPanelElmts.gdata_parse_next.html($.i18n._('gdata-parsing')["parse-next"]); @@ -176,9 +176,9 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() { this._parsingPanelElmts.gdata_conf_pars.html($.i18n._('gdata-parsing')["conf-pars"]); this._parsingPanelElmts.gdata_proj_name.html($.i18n._('gdata-parsing')["proj-name"]); this._parsingPanelElmts.createProjectButton.html($.i18n._('gdata-parsing')["create-proj"]); - this._parsingPanelElmts.gdata-options.html($.i18n._('gdata-parsing')["option"]); + this._parsingPanelElmts.gdata_options.html($.i18n._('gdata-parsing')["option"]); this._parsingPanelElmts.previewButton.html($.i18n._('gdata-parsing')["preview-button"]); - this._parsingPanelElmts.gdata-updating.html($.i18n._('gdata-parsing')["updating-preview"]); + this._parsingPanelElmts.gdata_updating.html($.i18n._('gdata-parsing')["updating-preview"]); this._parsingPanelElmts.gdata_discard_next.html($.i18n._('gdata-parsing')["discard-next"]); this._parsingPanelElmts.gdata_discard.html($.i18n._('gdata-parsing')["discard"]); this._parsingPanelElmts.gdata_limit_next.html($.i18n._('gdata-parsing')["limit-next"]); @@ -235,7 +235,7 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() { if (this._doc.type != 'table') { var sheetTable = this._parsingPanelElmts.sheetRecordContainer[0]; $.each(this._options.worksheets, function(i, v) { - var id = 'gdata-worksheet-' + Math.round(Math.random() * 1000000); + var id = 'gdata_worksheet-' + Math.round(Math.random() * 1000000); var tr = sheetTable.insertRow(sheetTable.rows.length); var td0 = $(tr.insertCell(0)).attr('width', '1%');