using angular.equals for checking selected class. closes #8

inmagik · Jan 3, 2016 · e8d9d5e · e8d9d5e
1 parent e5dc87b
commit e8d9d5e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/dist/ionic-modal-select.js b/dist/ionic-modal-select.js
@@ -61,14 +61,14 @@ var modalSelectTemplates = modalSelectTemplates || {};modalSelectTemplates['moda
     '            </p>\n' +
     '        </div>\n' +
     '        <div class="list" ng-if="showList" class="animate-if">\n' +
-    '            <div class="item item-text-wrap" collection-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{\'{{::ui.selectedClass}}\': getSelectedValue(option) == ui.value}"> \n' +
+    '            <div class="item item-text-wrap" collection-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{\'{{::ui.selectedClass}}\': compareValues(getSelectedValue(option), ui.value) }"> \n' +
     '                <div compile="inner" compile-once="true"></div>\n' +
     '            </div>\n' +
     '        </div>\n' +
     '    </div>\n' +
     '    <div ng-if="ui.shortList">\n' +
     '        <div class="list">\n' +
-    '            <div class="item item-text-wrap" ng-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{\'{{::ui.selectedClass}}\': getSelectedValue(option) == ui.value}">\n' +
+    '            <div class="item item-text-wrap" ng-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{\'{{::ui.selectedClass}}\': compareValues(getSelectedValue(option), ui.value) }">\n' +
     '                <div compile="inner" compile-once="true"></div>\n' +
     '            </div>\n' +
     '        </div>\n' +
@@ -243,6 +243,10 @@ angular.module('ionic-modal-select', [])
                     scope.showList = false;    
                 });
             };
+
+            scope.compareValues = function(a, b){
+                return angular.equals(a, b);
+            };
 
             //loading the modal
             var modalTpl = multiple ? 'modal-template-multiple.html' : 'modal-template.html';

diff --git a/dist/ionic-modal-select.min.js b/dist/ionic-modal-select.min.js
diff --git a/src/ionic-modal-select.js b/src/ionic-modal-select.js
@@ -144,6 +144,10 @@ angular.module('ionic-modal-select', [])
                     scope.showList = false;    
                 });
             };
+
+            scope.compareValues = function(a, b){
+                return angular.equals(a, b);
+            };
 
             //loading the modal
             var modalTpl = multiple ? 'modal-template-multiple.html' : 'modal-template.html';

diff --git a/src/modal-template.html b/src/modal-template.html
@@ -23,14 +23,14 @@ <h4 class="muted">{{::ui.loadListMessage}}</h4>
             </p>
         </div>
         <div class="list" ng-if="showList" class="animate-if">
-            <div class="item item-text-wrap" collection-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{'{{::ui.selectedClass}}': getSelectedValue(option) == ui.value}"> 
+            <div class="item item-text-wrap" collection-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{'{{::ui.selectedClass}}': compareValues(getSelectedValue(option), ui.value) }"> 
                 <div compile="inner" compile-once="true"></div>
             </div>
         </div>
     </div>
     <div ng-if="ui.shortList">
         <div class="list">
-            <div class="item item-text-wrap" ng-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{'{{::ui.selectedClass}}': getSelectedValue(option) == ui.value}">
+            <div class="item item-text-wrap" ng-repeat="option in options track by $index" ng-click="setOption(option)" ng-class="{'{{::ui.selectedClass}}': compareValues(getSelectedValue(option), ui.value) }">
                 <div compile="inner" compile-once="true"></div>
             </div>
         </div>