diff --git a/Gruntfile.js b/Gruntfile.js index b614c9d..e1f4085 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,3 @@ - module.exports = function(grunt) { var _ = require('underscore'); @@ -16,7 +15,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-karma'); grunt.loadNpmTasks('grunt-bump'); grunt.loadNpmTasks('lumbar'); - + // This will eventually get passed to grunt.initConfig() // Initialize multitasks... var config = { @@ -63,7 +62,7 @@ module.exports = function(grunt) { 'clean:modules', 'lumbar:build', 'concat:moduleVariables', - //'jshint:builtModules', + 'jshint:builtModules', 'uglify:modules' ]); @@ -384,7 +383,7 @@ module.exports = function(grunt) { */ config.shell['assume-unchanged'] = { - command: 'git update-index --assume-unchanged `git ls-files dist`' + command: 'git ls-files -z dist/ | xargs -0 git update-index --assume-unchanged' }; config.shell['no-assume-unchanged'] = { command: 'git update-index --no-assume-unchanged `git ls-files dist`' diff --git a/src/ResourceManager.js b/src/ResourceManager.js index c4b912b..6a689d1 100644 --- a/src/ResourceManager.js +++ b/src/ResourceManager.js @@ -1,7 +1,3 @@ -var ajaxDefaults = { - dataType: 'json', - cache: false -}; function ResourceManager(options) { var t = this; // exports @@ -54,7 +50,7 @@ function ResourceManager(options) { function fetchResources(useCache, currentView) { // if useCache is not defined, default to true useCache = (typeof useCache !== 'undefined' ? useCache : true); - if (cache != undefined && useCache) { + if (cache !== undefined && useCache) { // get from cache return cache; } else { diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js index c005f5d..209c4fb 100644 --- a/src/resource/ResourceEventRenderer.js +++ b/src/resource/ResourceEventRenderer.js @@ -167,7 +167,7 @@ function ResourceEventRenderer() { var resourceEvents = []; for (var i = 0; i < events.length; i++) { if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) { - resourceEvents.push(events[i]) + resourceEvents.push(events[i]); } } return resourceEvents; @@ -206,7 +206,7 @@ function ResourceEventRenderer() { slotSegmentContainer = getSlotSegmentContainer(), rtl, dis; - if (rtl = opt('isRTL')) { + if (rtl === opt('isRTL')) { dis = -1; }else{ dis = 1; @@ -282,7 +282,7 @@ function ResourceEventRenderer() { // record event sides and title positions for (i=0; i