From b72dd0fb62d14a2b73a1e29f71e99a1a1d781230 Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Mon, 13 May 2013 16:53:55 +0100 Subject: [PATCH] Enabled strict mode, and fixed issues raised. --- src/backend.csv.js | 3 ++- src/backend.dataproxy.js | 3 ++- src/backend.elasticsearch.js | 7 ++++--- src/backend.gdocs.js | 3 ++- src/backend.memory.js | 3 ++- src/model.js | 5 +++-- src/view.flot.js | 2 +- src/view.grid.js | 1 + src/view.map.js | 11 +++++------ src/view.multiview.js | 3 ++- src/view.slickgrid.js | 1 + src/view.timeline.js | 1 + src/widget.facetviewer.js | 1 + src/widget.fields.js | 3 ++- src/widget.filtereditor.js | 1 + src/widget.queryeditor.js | 1 + src/widget.valuefilter.js | 1 + 17 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/backend.csv.js b/src/backend.csv.js index aacfc5e9..e00aba78 100644 --- a/src/backend.csv.js +++ b/src/backend.csv.js @@ -4,10 +4,11 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {}; // Note that provision of jQuery is optional (it is **only** needed if you use fetch on a remote file) (function(my) { + "use strict"; my.__type__ = 'csv'; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; // ## fetch // diff --git a/src/backend.dataproxy.js b/src/backend.dataproxy.js index ffe36792..ae05bf2f 100644 --- a/src/backend.dataproxy.js +++ b/src/backend.dataproxy.js @@ -3,6 +3,7 @@ this.recline.Backend = this.recline.Backend || {}; this.recline.Backend.DataProxy = this.recline.Backend.DataProxy || {}; (function(my) { + "use strict"; my.__type__ = 'dataproxy'; // URL for the dataproxy my.dataproxy_url = '//jsonpdataproxy.appspot.com'; @@ -12,7 +13,7 @@ this.recline.Backend.DataProxy = this.recline.Backend.DataProxy || {}; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; // ## load // diff --git a/src/backend.elasticsearch.js b/src/backend.elasticsearch.js index 82ba52de..5d02965f 100644 --- a/src/backend.elasticsearch.js +++ b/src/backend.elasticsearch.js @@ -3,10 +3,11 @@ this.recline.Backend = this.recline.Backend || {}; this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {}; (function($, my) { + "use strict"; my.__type__ = 'elasticsearch'; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; // ## ElasticSearch Wrapper // @@ -200,8 +201,8 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {}; fields: fieldData }); }) - .fail(function(arguments) { - dfd.reject(arguments); + .fail(function(args) { + dfd.reject(args); }); return dfd.promise(); }; diff --git a/src/backend.gdocs.js b/src/backend.gdocs.js index 4d18aa9b..27eaee38 100644 --- a/src/backend.gdocs.js +++ b/src/backend.gdocs.js @@ -3,10 +3,11 @@ this.recline.Backend = this.recline.Backend || {}; this.recline.Backend.GDocs = this.recline.Backend.GDocs || {}; (function(my) { + "use strict"; my.__type__ = 'gdocs'; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; // ## Google spreadsheet backend // diff --git a/src/backend.memory.js b/src/backend.memory.js index 07e14fd6..861a0636 100644 --- a/src/backend.memory.js +++ b/src/backend.memory.js @@ -3,10 +3,11 @@ this.recline.Backend = this.recline.Backend || {}; this.recline.Backend.Memory = this.recline.Backend.Memory || {}; (function(my) { + "use strict"; my.__type__ = 'memory'; // private data - use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; // ## Data Wrapper // diff --git a/src/model.js b/src/model.js index 1e6e6441..b6a9461a 100644 --- a/src/model.js +++ b/src/model.js @@ -3,9 +3,10 @@ this.recline = this.recline || {}; this.recline.Model = this.recline.Model || {}; (function(my) { + "use strict"; // use either jQuery or Underscore Deferred depending on what is available -var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred; +var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; // ## Dataset my.Dataset = Backbone.Model.extend({ @@ -298,7 +299,7 @@ my.Record = Backbone.Model.extend({ // // NB: if field is undefined a default '' value will be returned getFieldValue: function(field) { - val = this.getFieldValueUnrendered(field); + var val = this.getFieldValueUnrendered(field); if (field && !_.isUndefined(field.renderer)) { val = field.renderer(val, field, this.toJSON()); } diff --git a/src/view.flot.js b/src/view.flot.js index b50c6000..c1802218 100644 --- a/src/view.flot.js +++ b/src/view.flot.js @@ -4,7 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { - + "use strict"; // ## Graph view for a Dataset using Flot graphing library. // // Initialization arguments (in a hash in first parameter): diff --git a/src/view.grid.js b/src/view.grid.js index 2a6a2b55..f826b76a 100644 --- a/src/view.grid.js +++ b/src/view.grid.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; // ## (Data) Grid Dataset View // // Provides a tabular view on a Dataset. diff --git a/src/view.map.js b/src/view.map.js index d6de52fc..1c463882 100644 --- a/src/view.map.js +++ b/src/view.map.js @@ -4,7 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { - + "use strict"; // ## Map view for a Dataset using Leaflet mapping library. // // This view allows to plot gereferenced records on a map. The location @@ -123,7 +123,7 @@ my.Map = Backbone.View.extend({ // } infobox: function(record) { var html = ''; - for (key in record.attributes){ + for (var key in record.attributes){ if (!(this.state.get('geomField') && key == this.state.get('geomField'))){ html += '
' + key + ': '+ record.attributes[key] + '
'; } @@ -172,8 +172,7 @@ my.Map = Backbone.View.extend({ // Also sets up the editor fields and the map if necessary. render: function() { var self = this; - - htmls = Mustache.render(this.template, this.model.toTemplateJSON()); + var htmls = Mustache.render(this.template, this.model.toTemplateJSON()); $(this.el).html(htmls); this.$map = this.el.find('.panel.map'); this.redraw(); @@ -326,7 +325,7 @@ my.Map = Backbone.View.extend({ if (!(docs instanceof Array)) docs = [docs]; _.each(docs,function(doc){ - for (key in self.features._layers){ + for (var key in self.features._layers){ if (self.features._layers[key].feature.properties.cid == doc.cid){ self.features.removeLayer(self.features._layers[key]); } @@ -560,7 +559,7 @@ my.MapMenu = Backbone.View.extend({ // Also sets up the editor fields and the map if necessary. render: function() { var self = this; - htmls = Mustache.render(this.template, this.model.toTemplateJSON()); + var htmls = Mustache.render(this.template, this.model.toTemplateJSON()); $(this.el).html(htmls); if (this._geomReady() && this.model.fields.length){ diff --git a/src/view.multiview.js b/src/view.multiview.js index 8542488b..e770d386 100644 --- a/src/view.multiview.js +++ b/src/view.multiview.js @@ -5,6 +5,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; // ## MultiView // // Manage multiple views together along with query editor etc. Usage: @@ -519,7 +520,7 @@ my.parseQueryString = function(q) { // Parse the query string out of the URL hash my.parseHashQueryString = function() { - q = my.parseHashUrl(window.location.hash).query; + var q = my.parseHashUrl(window.location.hash).query; return my.parseQueryString(q); }; diff --git a/src/view.slickgrid.js b/src/view.slickgrid.js index e4780fd8..48d0bad2 100644 --- a/src/view.slickgrid.js +++ b/src/view.slickgrid.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; // ## SlickGrid Dataset View // // Provides a tabular view on a Dataset, based on SlickGrid. diff --git a/src/view.timeline.js b/src/view.timeline.js index 87cdabe4..c4c7da69 100644 --- a/src/view.timeline.js +++ b/src/view.timeline.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; // turn off unnecessary logging from VMM Timeline if (typeof VMM !== 'undefined') { VMM.debug = false; diff --git a/src/widget.facetviewer.js b/src/widget.facetviewer.js index 396bc8eb..311fa2b0 100644 --- a/src/widget.facetviewer.js +++ b/src/widget.facetviewer.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; // ## FacetViewer // diff --git a/src/widget.fields.js b/src/widget.fields.js index 13078d2f..2d490091 100644 --- a/src/widget.fields.js +++ b/src/widget.fields.js @@ -20,7 +20,8 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { - + "use strict"; + my.Fields = Backbone.View.extend({ className: 'recline-fields-view', template: ' \ diff --git a/src/widget.filtereditor.js b/src/widget.filtereditor.js index 665c851b..ee6ea56f 100644 --- a/src/widget.filtereditor.js +++ b/src/widget.filtereditor.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; my.FilterEditor = Backbone.View.extend({ className: 'recline-filter-editor well', diff --git a/src/widget.queryeditor.js b/src/widget.queryeditor.js index 891983de..a3e594b1 100644 --- a/src/widget.queryeditor.js +++ b/src/widget.queryeditor.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; my.QueryEditor = Backbone.View.extend({ className: 'recline-query-editor', diff --git a/src/widget.valuefilter.js b/src/widget.valuefilter.js index 60c08e65..3b57e296 100644 --- a/src/widget.valuefilter.js +++ b/src/widget.valuefilter.js @@ -4,6 +4,7 @@ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; (function($, my) { + "use strict"; my.ValueFilter = Backbone.View.extend({ className: 'recline-filter-editor well',