diff --git a/javascripts/app.js b/javascripts/app.js
index 42eb960..6a448b3 100644
--- a/javascripts/app.js
+++ b/javascripts/app.js
@@ -7,7 +7,7 @@ require.config({
backbone: '../bower_components/backbone/backbone-min',
localforage: '../bower_components/localforage/dist/localforage',
localforagebackbone: '../bower_components/localforage-backbone/dist/localforage.backbone',
- modernizr: "vendor/custom.modernizr",
+ modernizr: "../bower_components/modernizr/custom.modernizr",
socket: "../bower_components/socket.io-client/socket.io",
text: '../bower_components/text/text',
marionette: '../bower_components/backbone.marionette/lib/backbone.marionette'
@@ -28,5 +28,5 @@ require([
'views/page'
],
function (App) {
- new App();
+ pageView = new App();
});
diff --git a/javascripts/collections/list.js b/javascripts/collections/list.js
index 45b0330..c874f9b 100644
--- a/javascripts/collections/list.js
+++ b/javascripts/collections/list.js
@@ -21,23 +21,33 @@ localforageBackbone
initialize: function(){
// update order on add, remove.
// Ref: http://stackoverflow.com/a/11665085/221742
- this.on('add remove', this.updateModelPriority);
+ this.on('add remove sort', this.updateModelPriority);
},
+ /**
+ * Move a model in the list up. Only a sort event is emitted
+ * @param {Backbone.Model} model - Model to be moved
+ */
moveUp: function(model) { // I see move up as the -1
var index = this.indexOf(model);
if (index > 0) {
- this.remove(model, {silent: true}); // silence this to stop excess event triggers
- this.add(model, {at: index-1});
+ this.remove(model, {silent: true});
+ this.add(model, {at: index-1, silent: true});
}
+ this.trigger('sort', this, {});
},
+ /**
+ * Move a model in the list up. Only a sort event is emitted
+ * @param {Backbone.Model} model - Model to be moved
+ */
moveDown: function(model) { // I see move up as the -1
var index = this.indexOf(model);
if (index < this.models.length) {
- this.remove(model, {silent: true}); // silence this to stop excess event triggers
- this.add(model, {at: index+1});
+ this.remove(model, {silent: true});
+ this.add(model, {at: index+1, silent: true});
}
+ this.trigger('sort', this, {});
},
/** Updated priority of each member of list **/
diff --git a/javascripts/data/demo.js b/javascripts/data/demo.js
index bb8aac6..5c0fc67 100644
--- a/javascripts/data/demo.js
+++ b/javascripts/data/demo.js
@@ -25,7 +25,7 @@
"updatedAt": "2016-01-29T05:44:30.858Z"
}, {
"id": 83,
- "content": "Desyncr pulled this together in a few hours to learn Backbone",
+ "content": "Pulled this together in a few hours to learn Backbone",
"parentId": 0,
"isCompleted": false,
"priority": 0,
diff --git a/javascripts/vendor/custom.modernizr.js b/javascripts/vendor/custom.modernizr.js
deleted file mode 100644
index 4eb3d06..0000000
--- a/javascripts/vendor/custom.modernizr.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-inlinesvg-svg-svgclippaths-touch-shiv-mq-cssclasses-teststyles-prefixes-ie8compat-load
- */
-;window.Modernizr=function(a,b,c){function y(a){j.cssText=a}function z(a,b){return y(m.join(a+";")+(b||""))}function A(a,b){return typeof a===b}function B(a,b){return!!~(""+a).indexOf(b)}function C(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:A(f,"function")?f.bind(d||b):f}return!1}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n={svg:"http://www.w3.org/2000/svg"},o={},p={},q={},r=[],s=r.slice,t,u=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["",'