Clean up feature flag mixin

2 files changed, 17 insertions, 15 deletions

diff --git a/web-ui/app/js/mixins/with_feature_toggle.js b/web-ui/app/js/mixins/with_feature_toggle.js
index cf8d0d07..9f4e3759 100644
--- a/web-ui/app/js/mixins/with_feature_toggle.js
+++ b/web-ui/app/js/mixins/with_feature_toggle.js
@@ -4,12 +4,14 @@ define(['features'],
     function withFeatureToggle(componentName, behaviorForFeatureOff) {
       return function() {
 
-        this.around('initialize', _.bind(function(basicInitialize) {
+        this.around('initialize', _.bind(function(basicInitialize, node, attrs) {
           if(features.isEnabled(componentName)) {
-            return basicInitialize(arguments[1], arguments[2]);
+            return basicInitialize(node, attrs);
           }
           else if (behaviorForFeatureOff){
-            behaviorForFeatureOff.bind(this).call();
+            behaviorForFeatureOff.call(this);
+
+            return this;
           }
         }, this));
       };
diff --git a/web-ui/app/js/tags/data/tags.js b/web-ui/app/js/tags/data/tags.js
index fc8976c7..f7700430 100644
--- a/web-ui/app/js/tags/data/tags.js
+++ b/web-ui/app/js/tags/data/tags.js
@@ -5,18 +5,18 @@ define(['flight/lib/component', 'page/events', 'mixins/with_feature_toggle'], fu
     $(document).trigger(events.ui.mails.refresh);
   }));
 
-      DataTags.all = {
-        name: 'all',
-        ident: '8752888923742657436',
-        query: 'in:all',
-        default: true,
-        counts:{
-          total:0,
-            read:0,
-            starred:0,
-            replied:0
-        }
-      };
+  DataTags.all = {
+    name: 'all',
+    ident: '8752888923742657436',
+    query: 'in:all',
+    default: true,
+    counts:{
+      total:0,
+        read:0,
+        starred:0,
+        replied:0
+    }
+  };
 
   return DataTags;