From 13e397a4edd0aedf1dd7d79464bcf0c72a7d9c84 Mon Sep 17 00:00:00 2001 From: Foster Hoff Date: Wed, 18 Jan 2017 11:17:36 -0800 Subject: [PATCH 1/3] add semicolons --- app/assets/javascripts/app/services/modelManager.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js index 3291eb98f..712e52aff 100644 --- a/app/assets/javascripts/app/services/modelManager.js +++ b/app/assets/javascripts/app/services/modelManager.js @@ -37,7 +37,7 @@ class ModelManager { } mapResponseItemsToLocalModelsOmittingFields(items, omitFields) { - var models = [] + var models = []; for (var json_obj of items) { json_obj = _.omit(json_obj, omitFields || []) var item = this.findItem(json_obj["uuid"]); @@ -59,10 +59,10 @@ class ModelManager { this.addItem(item); if(json_obj.content) { - this.resolveReferencesForItem(item) + this.resolveReferencesForItem(item); } - models.push(item) + models.push(item); } this.notifySyncObserversOfModels(models); @@ -132,7 +132,7 @@ class ModelManager { } addItem(item) { - this.addItems([item]) + this.addItems([item]); } itemsForContentType(contentType) { From c258f1866728ef7e99899bff3744a231afe452d7 Mon Sep 17 00:00:00 2001 From: Foster Hoff Date: Wed, 18 Jan 2017 13:07:06 -0800 Subject: [PATCH 2/3] insert tags by sorted titles --- app/assets/javascripts/app/services/modelManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js index 712e52aff..325f9f1ef 100644 --- a/app/assets/javascripts/app/services/modelManager.js +++ b/app/assets/javascripts/app/services/modelManager.js @@ -117,7 +117,7 @@ class ModelManager { items.forEach(function(item){ if(item.content_type == "Tag") { if(!_.find(this.tags, {uuid: item.uuid})) { - this.tags.unshift(item); + this.tags.splice(_.sortedIndexBy(this.tags, item, 'title'), 0, item); } } else if(item.content_type == "Note") { if(!_.find(this.notes, {uuid: item.uuid})) { @@ -128,7 +128,7 @@ class ModelManager { this._extensions.unshift(item); } } - }.bind(this)) + }.bind(this)); } addItem(item) { From a8198c1643464f003161e997d7886c1b3a77ef5e Mon Sep 17 00:00:00 2001 From: Foster Hoff Date: Wed, 18 Jan 2017 13:46:09 -0800 Subject: [PATCH 3/3] sort by lowercase --- app/assets/javascripts/app/services/modelManager.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js index 325f9f1ef..7ddf1d3b7 100644 --- a/app/assets/javascripts/app/services/modelManager.js +++ b/app/assets/javascripts/app/services/modelManager.js @@ -117,7 +117,10 @@ class ModelManager { items.forEach(function(item){ if(item.content_type == "Tag") { if(!_.find(this.tags, {uuid: item.uuid})) { - this.tags.splice(_.sortedIndexBy(this.tags, item, 'title'), 0, item); + this.tags.splice(_.sortedIndexBy(this.tags, item, function(item){ + if (item.title) return item.title.toLowerCase(); + else return '' + }), 0, item); } } else if(item.content_type == "Note") { if(!_.find(this.notes, {uuid: item.uuid})) {