Merge branch '78-base-mixin-beta'

Semantic-Org · Jan 22, 2016 · be2453b · be2453b
2 parents 326d415 + 0ce9bed
commit be2453b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/addon/mixins/base.js b/addon/mixins/base.js
@@ -1,6 +1,12 @@
 import Ember from 'ember';
 import Semantic from '../semantic';
 
+// Static properties to ignore
+const DEBUG = ['debug', 'performance', 'verbose'];
+const STANDARD = ['name', 'namespace', 'className', 'error', 'metadata', 'selector'];
+const EMBER = ['context', 'on', 'template', 'execute'];
+
+
 Semantic.BaseMixin = Ember.Mixin.create({
   init: function() {
     this._super();
@@ -26,19 +32,19 @@ Semantic.BaseMixin = Ember.Mixin.create({
 
     for (key in component.settings) {
       prop = component.settings[key];
-      if (window.$.inArray(key, Semantic.BaseMixin.DEBUG) >= 0) {
+      if (window.$.inArray(key, DEBUG) >= 0) {
         continue;
       }
 
-      if (window.$.inArray(key, Semantic.BaseMixin.STANDARD) >= 0) {
+      if (window.$.inArray(key, STANDARD) >= 0) {
         continue;
       }
 
       if (typeof prop === 'function' && typeof (this.get(key) || this.get(`_${key}`)) !== 'function') {
         continue;
       }
 
-      if (window.$.inArray(key, Semantic.BaseMixin.EMBER) >= 0) {
+      if (window.$.inArray(key, EMBER) >= 0) {
         value = this.get(`ui_${key}`);
       } else {
         if (typeof this.get(key) !== 'undefined') {
@@ -122,9 +128,4 @@ Semantic.BaseMixin = Ember.Mixin.create({
   }
 });
 
-// Static properties to ignore
-Semantic.BaseMixin.DEBUG = ['debug', 'performance', 'verbose'];
-Semantic.BaseMixin.STANDARD = ['name', 'namespace', 'className', 'error', 'metadata', 'selector'];
-Semantic.BaseMixin.EMBER = ['context', 'on', 'template', 'execute'];
-
 export default Semantic.BaseMixin;