Removed explicit setting of brackets for ngChange attribute. Code sho…

…uld be backward compatibile - for settings without brackets, they should still be inserted automatically. This solves the issue xpepermint#10
Tyrion85 · Jan 17, 2017 · e2f100a · e2f100a
1 parent bde4711
commit e2f100a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/angular-ui-switch.js b/angular-ui-switch.js
@@ -9,7 +9,7 @@ angular.module('uiSwitch', [])
       var html = '';
       html += '<span';
       html +=   ' class="switch' + (attrs.class ? ' ' + attrs.class : '') + '"';
-      html +=   attrs.ngModel ? ' ng-click="' + attrs.disabled + ' ? ' + attrs.ngModel + ' : ' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? '; ' + attrs.ngChange + '()"' : '"') : '';
+      html +=   attrs.ngModel ? ' ng-click="' + attrs.disabled + ' ? ' + attrs.ngModel + ' : ' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? ('; ' + attrs.ngChange + (/^.*\(.*\).*$/.test(attrs.ngChange) ? '' : '()') + '"') : '"') : '';
       html +=   ' ng-class="{ checked:' + attrs.ngModel + ', disabled:' + attrs.disabled + ' }"';
       html +=   '>';
       html +=   '<small></small>';

diff --git a/angular-ui-switch.min.js b/angular-ui-switch.min.js
diff --git a/example/app.js b/example/app.js
@@ -2,6 +2,7 @@ angular.module('app', ['uiSwitch'])
 
 .controller('MyController', function($scope) {
   $scope.enabled = true;
+  $scope.enabledWithArguments = true;
   $scope.onOff = true;
   $scope.yesNo = true;
   $scope.disabled = true;
@@ -10,4 +11,8 @@ angular.module('app', ['uiSwitch'])
   $scope.changeCallback = function() {
     console.log('This is the state of my model ' + $scope.enabled);
   };
+
+  $scope.changeCallbackWithArguments = function(arg) {
+    console.log('This is the state of my model ' + $scope.enabledWithArguments + '\nValue of passed argument is "' + arg.someArgument + '"' + "\n");
+  };
 });
diff --git a/example/index.html b/example/index.html
@@ -19,6 +19,17 @@
     <p>
         Enabled: {{ enabled }}
     </p>
+
+	<!-- Example with callback function with arguments -->
+	<switch name="enabledWithArguments" ng-model="enabledWithArguments" ng-change="changeCallbackWithArguments({'someArgument': 'Awesome'})"></switch>
+    <p>
+        <button ng-click="enabledWithArguments=!enabledWithArguments">Toggle</button>
+    </p>
+    <p>
+        EnabledWithArguments: {{ enabledWithArguments }}
+    </p>
+
+
      <!--Examples of using switch text on/off values.  These values can be anything.  First example shows basic on/off-->
 
     <switch name="onOff" ng-model="onOff" on="on" off="off"></switch>