cleanup + arangoHelper

frontend/js/arango/arango.js

@@ -1,61 +1,60 @@
-/*global functions */
+arangoHelper = {
+  systemAttributes: function () {
+    return {
+      '_id' : true,
+      '_rev' : true,
+      '_key' : true,
+      '_from' : true,
+      '_to' : true,
+      '_bidirectional' : true,
+      '_vertices' : true,
+      '_from' : true,
+      '_to' : true,
+      '$id' : true
+    };
+  },
 
-function systemAttributes () {
+  isSystemAttribute: function (val) {
-  return {
+    var a = this.systemAttributes();
-    '_id' : true,
+    return a[val];
-    '_rev' : true,
+  },
-    '_key' : true,
-    '_from' : true,
-    '_to' : true,
-    '_bidirectional' : true,
-    '_vertices' : true,
-    '_from' : true,
-    '_to' : true,
-    '$id' : true
-  };
-}
 
-function isSystemAttribute (val) {
+  isSystemCollection: function (val) {
-  var a = systemAttributes();
+    return val && val.name && val.name.substr(0, 1) === '_';
-  return a[val];
+  },
-}
 
-function isSystemCollection (val) {
+  collectionApiType: function (identifier) {
-  return val && val.name && val.name.substr(0, 1) === '_';
+    if (CollectionTypes[identifier] == undefined) {
-}
+      CollectionTypes[identifier] = getCollectionInfo(identifier).type;
+    }
 
-function collectionApiType (identifier) {
+    if (CollectionTypes[identifier] == 3) {
-  if (CollectionTypes[identifier] == undefined) {
+      return "edge";
-    CollectionTypes[identifier] = getCollectionInfo(identifier).type;
+    }
+    return "document";
+  },
+
+  collectionType: function (val) {
+    if (! val || val.name == '') {
+      return "-";
+    }
+
+    var type;
+    if (val.type == 2) {
+      type = "document";
+    }
+    else if (val.type == 3) {
+      type = "edge";
+    }
+    else {
+      type = "unknown";
+    }
+
+    if (isSystemCollection(val)) {
+      type += " (system)";
+    }
+
+    return type;
   }
 
-  if (CollectionTypes[identifier] == 3) {
+};
-    return "edge";
-  }
-  return "document";
-}
-
-function collectionType (val) {
-  if (! val || val.name == '') {
-    return "-";
-  }
-
-  var type;
-  if (val.type == 2) {
-    type = "document";
-  }
-  else if (val.type == 3) {
-    type = "edge";
-  }
-  else {
-    type = "unknown";
-  }
-
-  if (isSystemCollection(val)) {
-    type += " (system)";
-  }
-
-  return type;
-}
-
-

frontend/js/collections/arangoCollections.js

@@ -7,10 +7,6 @@ window.arangoCollections = Backbone.Collection.extend({
         return model.get('name').toLowerCase();
       },
 
-      isSystemCollection : function (name) {
-        return name.substr(0, 1) === '_';
-      },
-
       translateStatus : function (status) {
         if (status == 2) {
           return 'unloaded';
@@ -23,7 +19,7 @@ window.arangoCollections = Backbone.Collection.extend({
         var that = this;
 
         $.each(response.collections, function(key, val) {
-          val.isSystem = that.isSystemCollection(val.name); 
+          val.isSystem = arangoHelper.isSystemCollection(val.name);
           val.status = that.translateStatus(val.status);
         });
         return response.collections;

frontend/js/collections/arangoDocument.js

@@ -26,7 +26,7 @@ window.arangoDocument = Backbone.Collection.extend({
   },
   addDocument: function (collectionID) {
     var self = this;
-    var doctype = self.collectionApiType(collectionID);
+    var doctype = arangoHelper.collectionApiType(collectionID);
     if (doctype === 'edge') {
       alert("adding edge not implemented");
       return false;
@@ -50,16 +50,6 @@ window.arangoDocument = Backbone.Collection.extend({
       }
     });
   },
-  collectionApiType: function (identifier) {
-    if (this.CollectionTypes[identifier] == undefined) {
-      this.CollectionTypes[identifier] = this.getCollectionInfo(identifier).type;
-    }
-
-    if (this.CollectionTypes[identifier] == 3) {
-      return "edge";
-    }
-    return "document";
-  },
   getCollectionInfo: function (identifier) {
     var self = this;
 

frontend/js/views/documentSourceView.js

@@ -40,7 +40,7 @@ var documentSourceView = Backbone.View.extend({
     var data = arangoDocumentStore.models[0].attributes;
     var model = [];
     $.each(data, function(key, val) {
-      if (isSystemAttribute(key) === true) {
+      if (arangoHelper.isSystemAttribute(key) === true) {
         delete data[key];
       }
     });

frontend/js/views/documentView.js

@@ -39,7 +39,7 @@ var documentView = Backbone.View.extend({
   drawTable: function () {
     var self = this;
     $.each(window.arangoDocumentStore.models[0].attributes, function(key, value) {
-      if (self.isSystemAttribute(key)) {
+      if (arangoHelper.isSystemAttribute(key)) {
         $(self.table).dataTable().fnAddData([
           key,
           self.value2html(value, true),
@@ -101,30 +101,6 @@ var documentView = Backbone.View.extend({
     });
   },
 
-  systemAttributes: function () {
-    return {
-      '_id' : true,
-      '_rev' : true,
-      '_key' : true,
-      '_from' : true,
-      '_to' : true,
-      '_bidirectional' : true,
-      '_vertices' : true,
-      '_from' : true,
-      '_to' : true,
-      '$id' : true
-    };
-  },
-
-  isSystemAttribute: function (val) {
-    var a = this.systemAttributes();
-    return a[val];
-  },
-
-  isSystemCollection: function (val) {
-    return val && val.name && val.name.substr(0, 1) === '_';
-  },
-
   value2html: function (value, isReadOnly) {
     var self = this;
     var typify = function (value) {
@@ -172,7 +148,7 @@ var documentView = Backbone.View.extend({
         $(this).removeClass('writeable');
         i = 0;
       }
-      if (self.isSystemAttribute(this.innerHTML)) {
+      if (arangoHelper.isSystemAttribute(this.innerHTML)) {
         $(this).removeClass('writeable');
         i = 1;
       }