Updated to backbone 1.1.0, fixes #6

johvik · Oct 20, 2013 · 20de486 · 20de486
1 parent 4b724f2
commit 20de486
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 17 deletions.
diff --git a/js/vendor/backbone-min.js b/js/vendor/backbone-min.js
diff --git a/js/views/active/run.js b/js/views/active/run.js
@@ -14,7 +14,8 @@ define([
 ], function($, _, Backbone, Vm, Events, Workouts, Exercises, ActiveStartView, ActiveStepView, ActiveSummaryView, globalNotFoundTemplate, workoutDataGoneTemplate) {
   var ActiveRunPage = Backbone.View.extend({
     el : '#page',
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       var workout = Workouts.get(this.options.workoutId);
       if (_.isUndefined(workout)) {
         this.listenTo(Workouts, 'sync', this.render); // If workout isn't loaded directly

diff --git a/js/views/active/step.js b/js/views/active/step.js
@@ -17,7 +17,8 @@ define([
       'change input#weight-step' : 'onDataChange',
       'change input#reps-step' : 'onDataChange'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.data = JSON.parse(sessionStorage.getItem('workoutData'));
       this.exerciseData = JSON.parse(sessionStorage.getItem('exerciseData'));
       var setData = this.exerciseData[this.options.step - 1];

diff --git a/js/views/active/steprow.js b/js/views/active/steprow.js
@@ -7,7 +7,8 @@ define([
 ], function($, _, Backbone, Events, activeStepRowTemplate) {
   var ActiveStepRow = Backbone.View.extend({
     tagName : 'tr',
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.listenTo(Events, 'steprows:clear', this.remove);
     },
     render : function() {

diff --git a/js/views/active/summary.js b/js/views/active/summary.js
@@ -21,7 +21,8 @@ define([
       'click tr.click' : 'onRowClick',
       'change input#activeDate' : 'onDataChange'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.data = JSON.parse(sessionStorage.getItem('workoutData'));
       this.$el.html(_.template(activeSummaryTemplate, {
         workoutName : this.getWorkoutName(),

diff --git a/js/views/active/summaryrow.js b/js/views/active/summaryrow.js
@@ -9,7 +9,8 @@ define([
   var ActiveSummaryRow = Backbone.View.extend({
     tagName : 'tr',
     className : 'click',
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.listenTo(Exercises, 'sync', this.render);
     },
     render : function() {

diff --git a/js/views/exercise/edit.js b/js/views/exercise/edit.js
@@ -14,7 +14,8 @@ define([
       'keyup input' : 'onKeyup',
       'keypress input' : 'onKeypress'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.$el.html(exerciseEditTemplate);
     },
     render : function() {

diff --git a/js/views/exercise/page.js b/js/views/exercise/page.js
@@ -14,7 +14,8 @@ define([
     events : {
       'click #create-exercise' : 'createExercise'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.listenTo(Exercises, 'change:_id', function(e) {
         // New items will trigger id change
         this.options.editId = e.id;

diff --git a/js/views/exercise/select.js b/js/views/exercise/select.js
@@ -11,7 +11,8 @@ define([
 ], function($, _, Backbone, Vm, Exercises, exerciseSelectAddTemplate, exerciseSelectRemoveTemplate, exerciseOptionTemplate, exerciseOptionSelectTemplate) {
   var ExerciseSelectPage = Backbone.View.extend({
     className : 'form-group',
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.listenTo(Exercises, 'add', this.addOne);
       this.listenTo(Exercises, 'reset sort', this.reset);
       if (this.options.type === 'add') {

diff --git a/js/views/global/confirm.js b/js/views/global/confirm.js
@@ -4,6 +4,9 @@ define([
   'backbone',
 ], function($, _, Backbone) {
   var ConfirmView = Backbone.View.extend({
+    initialize : function(options) {
+      this.options = options;
+    },
     render : function() {
       var message = this.options.message || 'Are you sure?';
       if (true == confirm(message)) {

diff --git a/js/views/history/page.js b/js/views/history/page.js
@@ -12,7 +12,8 @@ define([
 ], function($, _, Backbone, Vm, Events, HistoryData, Workouts, WeightRowView, WorkoutDataRowView, historyListTemplate) {
   var HistoryDataPage = Backbone.View.extend({
     el : '#page',
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.listenTo(Workouts, 'sync', this.reset); // If workouts aren't loaded directly
       this.listenTo(HistoryData, 'add', this.addOne);
       this.listenTo(HistoryData, 'reset sort', this.reset);

diff --git a/js/views/history/weight/edit.js b/js/views/history/weight/edit.js
@@ -14,7 +14,8 @@ define([
       'keyup input' : 'onKeyup',
       'keypress input' : 'onKeypress'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.$el.html(weightEditTemplate);
     },
     render : function() {

diff --git a/js/views/history/workoutdata/edit.js b/js/views/history/workoutdata/edit.js
@@ -12,7 +12,8 @@ define([
 ], function($, _, Backbone, Vm, Events, Workouts, Exercises, ActiveStepView, ActiveSummaryView, workoutDataGoneTemplate) {
   var WorkoutDataEditPage = Backbone.View.extend({
     el : '#page',
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       var workout = Workouts.get(this.options.workoutId);
       if (_.isUndefined(workout)) {
         this.listenTo(Workouts, 'sync', this.render); // If workout isn't loaded directly

diff --git a/js/views/workout/edit.js b/js/views/workout/edit.js
@@ -18,7 +18,8 @@ define([
       'keyup input' : 'onKeyup',
       'keypress input' : 'onKeypress'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.$el.html(workoutEditTemplate);
       this.selectAddView = new ExerciseSelectView({
         type : 'add'

diff --git a/js/views/workout/page.js b/js/views/workout/page.js
@@ -15,7 +15,8 @@ define([
     events : {
       'click #create-workout' : 'createWorkout'
     },
-    initialize : function() {
+    initialize : function(options) {
+      this.options = options;
       this.listenTo(Workouts, 'change:_id', function(w) {
         // New items will trigger id change
         this.options.editId = w.id;