fix variable redefinition error, add missing semi-colons, proper path…

… definitions

js/adapt-nudge.js

@@ -1,6 +1,6 @@
 define([
-    'coreJS/adapt',
-    'coreModels/componentModel',
+    'core/js/adapt',
+    'core/js/models/componentModel',
     './pageNudge',
     './trickleNudge'
 ], function(Adapt, ComponentModel) {
@@ -95,7 +95,7 @@ define([
 
             model.set({
                 '_nudge':_.extend({}, defaults, cfg),
-                '_isNudgeConfigured':true
+                '_isNudgeConfigured': true
             });
 
             return model.get('_nudge');
@@ -116,7 +116,7 @@ define([
 
             require('extensions/adapt-contrib-spoor/js/serializers/scormSuspendDataSerializer');
 
-            var data = SCORMSuspendData.deserialize(data);
+            data = SCORMSuspendData.deserialize(data);
             var i = 0;
 
             cfg._hasUserGotScroll = data[i++];
@@ -157,7 +157,7 @@ define([
                 cfg = this.getConfig(co);
                 data.push(cfg._isScrollEnabled, cfg._isPlpEnabled, cfg._isTrickleEnabled, cfg._isPageCompletionEnabled);
             }, this);
-            
+
             return data;
         },
 

js/pageNudge.js

@@ -1,5 +1,5 @@
 define([
-	'coreJS/adapt',
+	'core/js/adapt',
 	'./pageNudgeView',
 	'./enums/nudgeStateEnum'
 ], function(Adapt, PageNudgeView, NUDGE_STATE) {
@@ -164,7 +164,7 @@ define([
 				}
 			});
 			var ret = {'onscreen':onscreen, 'offscreen':offscreen};
-			
+
 			return ret;
 		},
 
@@ -180,7 +180,7 @@ define([
 			var plpModeDisabled = !courseConfig._isPlpEnabled || !pageConfig._isPlpEnabled;
 			var nudgePlpBeforeScroll = courseConfig._nudgePlpBeforeScroll;
 			var pageCompletionDisabled = !courseConfig._isPageCompletionEnabled || !pageConfig._isPageCompletionEnabled;
-			
+
 			switch (this._mode) {
 				case NUDGE_STATE.COMPLETE:
 					if (Adapt.nudge.debug) console.log('_changeMode: mode=complete, calling finish');
@@ -256,8 +256,8 @@ define([
 		},
 
 		logComponentVisibilityState:function(state) {
-			console.log('onscreen:', _.map(state.onscreen, function(s){return s.component.get('_id')}).join(','));
-			console.log('offscreen:', _.map(state.offscreen, function(s){return s.component.get('_id')}).join(','));
+			console.log('onscreen:', _.map(state.onscreen, function(s){return s.component.get('_id');}).join(','));
+			console.log('offscreen:', _.map(state.offscreen, function(s){return s.component.get('_id');}).join(','));
 		},
 
 		onScroll:function() {
@@ -353,7 +353,7 @@ define([
 			else if (this._mode == NUDGE_STATE.COMPLETE) courseConfig._hasUserGotPageCompletion = true;
 
 			Adapt.nudge.saveState();
-			
+
 			this._changeMode();
 		},
 

js/pageNudgeView.js

@@ -1,5 +1,5 @@
 define([
-    'coreJS/adapt',
+    'core/js/adapt',
     './enums/nudgeStateEnum'
 ], function(Adapt, NUDGE_STATE) {
 

js/trickleNudge.js

@@ -1,5 +1,5 @@
 define([
-	'coreJS/adapt',
+	'core/js/adapt',
 	'./trickleNudgeView'
 ], function(Adapt, TrickleNudgeView) {
 

js/trickleNudgeView.js

@@ -1,5 +1,5 @@
 define([
-    'coreJS/adapt'
+    'core/js/adapt'
 ], function(Adapt) {
 
     var TrickleNudgeView = Backbone.View.extend({
@@ -40,8 +40,8 @@ define([
             if (this.state._isVisible == visible) return;
 
             this.state._isVisible = visible;
-            this.$el.toggleClass('display-none', !visible)
-            
+            this.$el.toggleClass('display-none', !visible);
+
             if (visible) {
                 this.$el.css('bottom', $('.trickle-button-inner', this.state._$trickleComponent).outerHeight());
             }