weechat-protocol.js: clean code (indentation/trailing spaces)

js/websockets.js

@@ -324,7 +324,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'pluginManager', function($
 }]);
 
 weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', function($rootScope, $log, handlers, colors) {
-    protocol = new Protocol();
+    protocol = new WeeChatProtocol();
     var websocket = null;
 
 

js/weechat-protocol.js

@@ -1,10 +1,11 @@
-var Protocol = function() {
+var WeeChatProtocol = function() {
     var self = this;
 
     var getInfo = function() {
         var info = {};
         info.key = getString();
         info.value = getString();
+
         return info;
     };
 
@@ -14,8 +15,6 @@ var Protocol = function() {
         var objs = [];
         var hpath = getString();
 
-	    
-
         keys = getString().split(',');
         paths = hpath.split('/');
         count = getInt();
@@ -23,69 +22,76 @@ var Protocol = function() {
         keys = keys.map(function(key) {
             return key.split(':');
         });
-	    var i;
-	    for (i = 0; i < count; i++) {
+
+        for (var i = 0; i < count; i++) {
             var tmp = {};
 
             tmp.pointers = paths.map(function(path) {
                 return getPointer();
             });
-
             keys.forEach(function(key) {
                 tmp[key[0]] = runType(key[1]);
             });
             objs.push(tmp);
         };
+
         return objs;
     };
 
     function getPointer() {
         var l = getChar();
-
         var pointer = getSlice(l)
         var parsed_data = new Uint8Array(pointer);
-            return _uiatos(parsed_data);
 
+        return _uiatos(parsed_data);
     };
 
-        var _uiatos =function(uia) {
+    var _uiatos = function(uia) {
         var _str = [];
         for (var c = 0; c < uia.length; c++) {
             _str[c] = String.fromCharCode(uia[c]);
         }
+
         return decodeURIComponent(escape(_str.join("")));
     };
 
     var getInt = function() {
         var parsed_data = new Uint8Array(getSlice(4));
         var i = ((parsed_data[0] & 0xff) << 24) | ((parsed_data[1] & 0xff) << 16) | ((parsed_data[2] & 0xff) << 8) | (parsed_data[3] & 0xff);
-            return i;
 
+        return i;
     };
 
     var getChar = function() {
         var parsed_data = new Uint8Array(getSlice(1));
+
         return parsed_data[0];
     };
 
     var getString = function() {
         var l = getInt();
+
         if (l > 0) {
             var s = getSlice(l);
             var parsed_data = new Uint8Array(s);
+
             return _uiatos(parsed_data);
         }
+
         return "";
     };
 
     var getSlice = function(length) {
         var slice = self.data.slice(0,length);
+
         self.data = self.data.slice(length);
+
         return slice;
     };
 
     var getType = function() {
         var t = getSlice(3);
+
         return _uiatos(new Uint8Array(t));
     };
 
@@ -93,14 +99,16 @@ var Protocol = function() {
         if (type in types) {
             return types[type]();
         }
-            0;
     };
 
     var getHeader = function() {
+        var len = getInt();
+        var comp = getChar();
+
         return {
-                length: getInt(),
-                compression: getChar(),
-            }
+            length: len,
+            compression: comp,
+        };
     };
 
     var getId = function() {
@@ -109,6 +117,7 @@ var Protocol = function() {
 
     var getObject = function() {
         var type = getType();
+
         if (type) {
             return object = {
                 type: type,
@@ -119,19 +128,22 @@ var Protocol = function() {
 
     self.parse = function(data) {
         self.setData(data);
+
         var header = getHeader();
         var id = getId();
         var objects = [];
         var object = getObject();
+
         while(object) {
             objects.push(object);
             object = getObject();
         }
+
         return {
             header: header,
             id: id,
             objects: objects,
-            }
+        };
     }
 
     self.setData = function (data) {
@@ -146,10 +158,11 @@ var Protocol = function() {
         type = getType();
         count = getInt();
         values = [];
-	    var i;
-	    for (i = 0; i < count; i++) {
+
+        for (var i = 0; i < count; i++) {
             values.push(runType(type));
         };
+
         return values;
     }
 
@@ -165,16 +178,17 @@ var Protocol = function() {
         buf: getString,
         arr: array
     };
+
 //TODO: IMPLEMENT THIS STUFF
 //            chr: this.getChar,
 //            'int': getInt,
-            // hacks
+// hacks
 
-            // hacks
+// hacks
 //            htb: getHashtable,
 //            inf: Protocol.getInfo,
 //            inl: getInfolist,
 
 //        },
 
-}
+};