From 19ccd1efd59b3f748c27e9b5aa4f9b031909f491 Mon Sep 17 00:00:00 2001
From: Adam DiCarlo <adicarlo@newrelic.com>
Date: Mon, 5 Jan 2015 16:07:30 -0800
Subject: [PATCH 1/2] Move switch state CSS classes to outer div.

---
 angular-toggle-switch.css | 18 +++++++++---------
 angular-toggle-switch.js  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/angular-toggle-switch.css b/angular-toggle-switch.css
index 9a430ab..3ba1557 100644
--- a/angular-toggle-switch.css
+++ b/angular-toggle-switch.css
@@ -43,11 +43,18 @@
     z-index: 100;
 }
 
-.toggle-switch .switch-on {
+.toggle-switch-animate {
+    transition: left 0.5s;
+    -o-transition: left 0.5s;
+    -moz-transition: left 0.5s;
+    -webkit-transition: left 0.5s;
+}
+
+.toggle-switch.switch-on .toggle-switch-animate {
     left: 0%;
 }
 
-.toggle-switch .switch-off {
+.toggle-switch.switch-off .toggle-switch-animate {
     left: -50%
 }
 
@@ -64,10 +71,3 @@
     color: #333;
     background: #f0f0f0;
 }
-
-.toggle-switch-animate {
-    transition: left 0.5s;
-    -o-transition: left 0.5s;
-    -moz-transition: left 0.5s;
-    -webkit-transition: left 0.5s;
-}
diff --git a/angular-toggle-switch.js b/angular-toggle-switch.js
index 97fb3cd..529c585 100644
--- a/angular-toggle-switch.js
+++ b/angular-toggle-switch.js
@@ -27,8 +27,8 @@
         offLabel: '@',
         knobLabel: '@'
       },
-      template: '<div role="radio" class="toggle-switch" ng-class="{ \'disabled\': disabled }">' +
-          '<div class="toggle-switch-animate" ng-class="{\'switch-off\': !model, \'switch-on\': model}">' +
+      template: '<div role="radio" class="toggle-switch" ng-class="{\'disabled\': disabled, \'switch-off\': !model, \'switch-on\': model}">' +
+          '<div class="toggle-switch-animate">' +
           '<span class="switch-left" ng-bind="onLabel"></span>' +
           '<span class="knob" ng-bind="knobLabel"></span>' +
           '<span class="switch-right" ng-bind="offLabel"></span>' +

From a83975c09d6eba7c8dc87e4f1aed8ee7478ed10c Mon Sep 17 00:00:00 2001
From: Adam DiCarlo <adicarlo@newrelic.com>
Date: Mon, 5 Jan 2015 16:36:26 -0800
Subject: [PATCH 2/2] Allow empty labels via attrs.

---
 angular-toggle-switch.js           |  6 +++---
 test/angular-toggle-switch.spec.js | 27 ++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/angular-toggle-switch.js b/angular-toggle-switch.js
index 529c585..e1ad7a3 100644
--- a/angular-toggle-switch.js
+++ b/angular-toggle-switch.js
@@ -35,9 +35,9 @@
           '</div>' +
           '</div>',
       compile: function(element, attrs) {
-        if (!attrs.onLabel) { attrs.onLabel = toggleSwitchConfig.onLabel; }
-        if (!attrs.offLabel) { attrs.offLabel = toggleSwitchConfig.offLabel; }
-        if (!attrs.knobLabel) { attrs.knobLabel = toggleSwitchConfig.knobLabel; }
+        if (angular.isUndefined(attrs.onLabel)) { attrs.onLabel = toggleSwitchConfig.onLabel; }
+        if (angular.isUndefined(attrs.offLabel)) { attrs.offLabel = toggleSwitchConfig.offLabel; }
+        if (angular.isUndefined(attrs.knobLabel)) { attrs.knobLabel = toggleSwitchConfig.knobLabel; }
 
         return this.link;
       },
diff --git a/test/angular-toggle-switch.spec.js b/test/angular-toggle-switch.spec.js
index 677ac54..a42bac1 100644
--- a/test/angular-toggle-switch.spec.js
+++ b/test/angular-toggle-switch.spec.js
@@ -1,7 +1,10 @@
 describe('Toggle Switch', function() {
-  var $scope, $compile;
+  var $scope, $compile, isolateScope;
 
   var baseTemplate = '<toggle-switch ng-model="switchState">\n</toggle-switch>';
+  var emptyOnLabelTemplate = '<toggle-switch ng-model="switchState" on-label="">\n</toggle-switch>';
+  var emptyOffLabelTemplate = '<toggle-switch ng-model="switchState" off-label="">\n</toggle-switch>';
+  var emptyKnobLabelTemplate = '<toggle-switch ng-model="switchState" knob-label="">\n</toggle-switch>';
   var onLabelTemplate = '<toggle-switch ng-model="switchState" on-label="CUSTOM-ON">\n</toggle-switch>';
   var offLabelTemplate = '<toggle-switch ng-model="switchState" off-label="CUSTOM-OFF">\n</toggle-switch>';
   var knobLabelTemplate = '<toggle-switch ng-model="switchState" knob-label="CUSTOM">\n</toggle-switch>';
@@ -22,6 +25,7 @@ describe('Toggle Switch', function() {
     var elm = angular.element(template);
     $compile(elm)(scope);
     scope.$apply();
+    isolateScope = elm.isolateScope();
     return elm;
   }
 
@@ -96,6 +100,13 @@ describe('Toggle Switch', function() {
     });
   });
 
+  describe('with an empty `on-label`', function() {
+    it('sets the label empty', function() {
+      var elm = compileDirective(emptyOnLabelTemplate, $scope);
+      expect(isolateScope.onLabel).toEqual('');
+    });
+  });
+
   describe('when there is a custom `off-label`', function () {
     // @TODO: figure out how to deal with html in Angular 1.2
     //describe('is html', function() {
@@ -113,6 +124,13 @@ describe('Toggle Switch', function() {
     });
   });
 
+  describe('with an empty `off-label`', function() {
+    it('sets the label empty', function() {
+      var elm = compileDirective(emptyOffLabelTemplate, $scope);
+      expect(isolateScope.offLabel).toEqual('');
+    });
+  });
+
   describe('when there is a custom `knob-label`', function () {
     it('sets the on label', function() {
       var elm = compileDirective(knobLabelTemplate, $scope);
@@ -120,6 +138,13 @@ describe('Toggle Switch', function() {
     });
   });
 
+  describe('with an empty `knob-label`', function() {
+    it('sets the label empty', function() {
+      var elm = compileDirective(emptyKnobLabelTemplate, $scope);
+      expect(isolateScope.knobLabel).toEqual('');
+    });
+  });
+
   describe('when toggle is disabled', function() {
     it('ngModel does not change on click', function() {
       $scope.switchState = true;