Linted

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 public/vendor
 public/dist
+.DS_Store

gulpfile.js

@@ -8,7 +8,7 @@ var watchify = require('watchify');
 var uglify = require('gulp-uglify');
 var pump = require('pump');
 
-var browserSync = require('browser-sync').create()
+var browserSync = require('browser-sync').create();
 
 function compile(watch) {
 
@@ -38,7 +38,7 @@ function compile(watch) {
 
 function watch() {
   return compile(true);
-};
+}
 
 gulp.task('build-watch', ['build'], function (done) {
     browserSync.reload();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mi-model",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Model for representing Molecular Interaction data",
   "main": "src/index.js",
   "scripts": {

src/index.js

@@ -1,3 +1,3 @@
 MIData = require("./models/MIData");
 
-module.exports = MIData
+module.exports = MIData;

src/models/Feature.js

@@ -11,11 +11,11 @@ Feature = Backbone.Model.extend({
     var sequenceDataCol = new Regions();
 
 
-    if (attrs.sequenceData != null) {
+    if (attrs.sequenceData !== null) {
 
       var abc = _.map(attrs.sequenceData, function(s) {
-        s.feature = this
-        return s
+        s.feature = this;
+        return s;
       }, this);
 
       // console.log("abc", abc);
@@ -48,4 +48,4 @@ Features = Backbone.Collection.extend({
 
 });
 
-module.exports = {Feature: Feature, Features: Features}
+module.exports = {Feature: Feature, Features: Features};

src/models/Interaction.js

@@ -1,12 +1,13 @@
 _ = require('underscore');
-Backbone = require('backbone')
+Backbone = require('backbone');
 
-Participants = require('./Participant').Participants
+Participants = require('./Participant').Participants;
 Features = require('./Feature').Features;
 Links = require('./Link').Links;
 
 _ = require('underscore');
 
+
 Interaction = Backbone.Model.extend({
 
   defaults: {
@@ -44,18 +45,18 @@ Interaction = Backbone.Model.extend({
     // Also, now that all features exist, link them to each other
     this.get("features").each(function(feature) {
       feature.set("linkedFeatures", new Features(_.map(feature.get("linkedFeatures"), function(id) {
-        return this.get("features").get(id)
+        return this.get("features").get(id);
       }, this)));
     }, this);
 
 
     // Populate the features collection
     // TODO: Avoid Duplicates
     this.get("features").each(function(feature) {
-      var links = new Links()
+      var links = new Links();
       feature.get("linkedFeatures").each(function(f) {
         links.add(f);
-      })
+      });
       links.add(feature);
       this.get("links").add({features: links});
     }, this);
@@ -70,4 +71,4 @@ Interactions = Backbone.Collection.extend({
 
 });
 
-module.exports = {Interaction: Interaction, Interactions: Interactions}
+module.exports = {Interaction: Interaction, Interactions: Interactions};

src/models/Interactor.js

@@ -1,6 +1,6 @@
-Backbone = require('backbone')
+Backbone = require('backbone');
 
-Participants = require("./Participant").Participants
+Participants = require("./Participant").Participants;
 
 Interactor = Backbone.Model.extend({
 
@@ -16,4 +16,4 @@ Interactors = Backbone.Collection.extend({
 
 });
 
-module.exports = {Interactor: Interactor, Interactors: Interactors}
+module.exports = {Interactor: Interactor, Interactors: Interactors};

src/models/Link.js

@@ -1,4 +1,4 @@
-Backbone = require('backbone')
+Backbone = require('backbone');
 
 Link = Backbone.Model.extend({
 
@@ -12,4 +12,4 @@ Links = Backbone.Collection.extend({
 
 });
 
-module.exports = {Link: Link, Links: Links}
+module.exports = {Link: Link, Links: Links};

src/models/MIData.js

@@ -1,5 +1,5 @@
 _ = require('underscore');
-Backbone = require('backbone')
+Backbone = require('backbone');
 parse = require('../utils/parse.js');
 Interactions = require('./Interaction').Interactions;
 Interactors = require('./Interactor').Interactors;
@@ -34,16 +34,16 @@ Data = Backbone.Model.extend({
     var that = this;
 
     var reflect = function reflect(promise) {
-      return promise.then(function(v){ return {v:v, status: "resolved" }}, function(e){ return {e:e, status: "rejected" }});
-    }
+      return promise.then(function(v){ return {v:v, status: "resolved" };}, function(e){ return {e:e, status: "rejected" };});
+    };
 
 
     // Fetch the lengths of our participants
     var requests = this.get("interactors").map(function(i){
 
       return $.get(this.uniprotUrl + i.get("identifier").id,
       function(data) {
-        i.set("length", parseInt(data[0]["length"]))
+        i.set("length", parseInt(data[0].length));
       });
 
     }, this);
@@ -76,4 +76,4 @@ Data = Backbone.Model.extend({
 });
 
 
-module.exports = Data
+module.exports = Data;

src/models/Participant.js

@@ -1,8 +1,8 @@
 _ = require('underscore');
-Backbone = require('backbone')
+Backbone = require('backbone');
 
-Features = require('./Feature').Features
-Feature = require('./Feature').Feature
+Features = require('./Feature').Features;
+Feature = require('./Feature').Feature;
 
 Participant = Backbone.Model.extend({
 
@@ -13,7 +13,7 @@ Participant = Backbone.Model.extend({
       this.get("interaction")
           .get("midata")
           .get("interactors")
-          .get(this.get("interactorRef")))
+          .get(this.get("interactorRef")));
     } catch (e) {
       console.log("Error creating iner");
 
@@ -61,4 +61,4 @@ Participants = Backbone.Collection.extend({
 
 });
 
-module.exports = {Participant: Participant, Participants: Participants}
+module.exports = {Participant: Participant, Participants: Participants};

src/models/Region.js

@@ -1,4 +1,4 @@
-Backbone = require('backbone')
+Backbone = require('backbone');
 
 var Region = Backbone.Model.extend({
 
@@ -10,8 +10,17 @@ var Region = Backbone.Model.extend({
       var start = s[0];
       var end = s[1];
 
-      isNaN(parseInt(start)) ? this.set("start", null) : this.set("start", parseInt(start));
-      isNaN(parseInt(end)) ? this.set("end", null) : this.set("end", parseInt(end));
+      if (isNaN(parseInt(start))) {
+        this.set("start", null);
+      } else {
+        this.set("start", parseInt(start));
+      }
+
+      if (isNaN(parseInt(end))) {
+        this.set("end", null);
+      } else {
+        this.set("end", parseInt(end));
+      }
 
     } catch (e) {
       // No region data
@@ -27,4 +36,4 @@ var Regions = Backbone.Collection.extend({
 
 });
 
-module.exports = {Region: Region, Regions: Regions}
+module.exports = {Region: Region, Regions: Regions};

src/utils/parse.js

@@ -18,4 +18,4 @@ interactors = function(json) {
   });
 };
 
-module.exports = {participants: participants, interactions: interactions, interactors: interactors}
+module.exports = {participants: participants, interactions: interactions, interactors: interactors};