glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

small fixes in backbone

Browse source
This commit is contained in:
Connor Turland 2014-08-10 16:20:21 -04:00
parent bc593fe614
commit a90eb90822
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/metamaps/Metamaps.Backbone.js
View file

@ -30,7 +30,7 @@ Metamaps.Backbone.Map = Backbone.Model.extend({
name: this.get('name'), name: this.get('name'),
desc: this.get('desc'), desc: this.get('desc'),
username: this.getUser().get('name'), username: this.getUser().get('name'),
mkPermission: this.get("permission").substring(0, 2), mkPermission: this.get("permission") ? this.get("permission").substring(0, 2) : "commons",
editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit', editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit',
topicCount: this.getTopics().length, topicCount: this.getTopics().length,
synapseCount: this.getSynapses().length, synapseCount: this.getSynapses().length,
@ -52,8 +52,8 @@ Metamaps.Backbone.MapsCollection = Backbone.Collection.extend({
a = a.get(this.sortBy); a = a.get(this.sortBy);
b = b.get(this.sortBy); b = b.get(this.sortBy);
if (this.sortBy === 'name') { if (this.sortBy === 'name') {
a = a.toLowerCase(); a = a ? a.toLowerCase() : "";
b = b.toLowerCase(); b = b ? b.toLowerCase() : "";
} }
return a > b ? 1 : a < b ? -1 : 0; return a > b ? 1 : a < b ? -1 : 0;
}, },

4
app/assets/javascripts/metamaps/Metamaps.Views.js
View file

@ -46,6 +46,9 @@ Metamaps.Views.init = function () {
this.listenTo(this.collection, 'errorOnFetch', this.handleError); this.listenTo(this.collection, 'errorOnFetch', this.handleError);
}, },
render: function () { render: function () {
Metamaps.Loading.loader.hide();
var that = this; var that = this;
this.$el.empty(); this.$el.empty();
@ -56,7 +59,6 @@ Metamaps.Views.init = function () {
}); });
}, },
handleSuccess: function () { handleSuccess: function () {
Metamaps.Loading.loader.hide();
this.render(); this.render();
}, },
handleError: function () { handleError: function () {