fixed some jshint things

massiveart · Sep 25, 2013 · bd31bb5 · bd31bb5
1 parent 034be7d
commit bd31bb5
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 109 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,4 +1,8 @@
 {
+    "globals": {
+        "require": false,
+        "define": false
+    },
     "latedef" : true,
     "newcap" : true,
     "curly" : true,

diff --git a/demos/aurajs/header/index.html b/demos/aurajs/header/index.html
@@ -14,7 +14,7 @@
     </head>
     <body>
 
-        <div data-aura-component="header@husky" data-aura-button-type="saveDelete"></div>
+        <div data-aura-component="header@husky" ></div>
 
         <script src="../js/sinon.js"></script>
         <script src="../js/jquery.js"></script>
@@ -34,6 +34,14 @@
 
                 app.start().then(function() {
                     app.logger.log('Aura started...');
+
+
+                    setTimeout(function() {
+                        app.sandbox.emit('husky.header.button-type', 'save');
+                        app.sandbox.emit('husky.header.button-state', 'dirty');
+
+
+                    }, 500);
                 });
 
             });

diff --git a/dist/husky.js b/dist/husky.js
diff --git a/husky_components/button/main.js b/husky_components/button/main.js
@@ -53,7 +53,6 @@ define([], function() {
                     },
                     disable: function() {
                         this.sandbox.dom.addClass(this.$el, 'disable');
-                        this.sandbox.dom.removeClass(this.$el, 'pointer');
 
                         type.unBindDomEvents.call(this);
                     },
@@ -72,6 +71,7 @@ define([], function() {
         },
         defaults = {
             buttonType: 'icon',         // type of button [icon, custom]
+            buttonState: null,            // type of button [icon, custom]
             instanceName: 'undefined',  // name of instance used in events
             text: 'undefined',          // button text
             iconType: 'caution',        // button icon
@@ -112,6 +112,10 @@ define([], function() {
 
             type.init.call(this);
 
+            if (!!this.options.buttonState) {
+                this.changeState(this.options.buttonState);
+            }
+
             this.bindCustomEvents();
         },
 
@@ -121,6 +125,7 @@ define([], function() {
 
         bindCustomEvents: function() {
             this.sandbox.on(this.getEvent('state'), this.changeState.bind(this));
+            this.sandbox.on(this.getEvent('set-content'), this.setContent.bind(this));
         },
 
         changeState: function(state) {
@@ -130,6 +135,11 @@ define([], function() {
             } else {
                 throw 'not implemented';
             }
+        },
+
+        setContent:function(text, icon) {
+            console.log("bla");
+            console.log("this.el", this.$el);
         }
-    }
+    };
 });