Merge pull request mishguruorg#36 from jfrumar/update-deprecated-loda…

…sh-function Update deprecated lodash function
ShahzaibSE · Mar 14, 2016 · fbec519 · fbec519
2 parents 5a957ab + 6cf6b7a
commit fbec519
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/angular-timezone-selector.js b/angular-timezone-selector.js
@@ -102,10 +102,10 @@ angular.module('angular-timezone-selector', [])
           if (jstz !== undefined) {
             // Make sure the tz from jstz has underscores replaced with spaces so it matches
             // the format used in timezoneFactory
-            var extraTZs = _.where(timezones, { 'id': jstz.determine().name().replace(/_/g, ' ') })
+            var extraTZs = _.filter(timezones, { 'id': jstz.determine().name() })
           } else {
             var localUTC = 'UTC' + moment().format('Z')
-            extraTZs = _.where(timezones, {'offset': localUTC})
+            extraTZs = _.filter(timezones, {'offset': localUTC})
           }
 
           data.splice(0, 0, {

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-timezone-selector",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "homepage": "https://github.com/mishguruorg/angular-timezone-selector",
   "authors": [
     "Ashok Fernandez <ashok@mish.guru>"

diff --git a/build/angular-timezone-selector.js b/build/angular-timezone-selector.js
diff --git a/dist/angular-timezone-selector.css b/dist/angular-timezone-selector.css
@@ -11,8 +11,8 @@
   vertical-align: middle;
 }
 .chosen-container .chosen-drop {
-  background: #ffffff;
-  border: 1px solid #cccccc;
+  background: #fff;
+  border: 1px solid #ccc;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
   box-shadow: 0 8px 8px rgba(0, 0, 0, .25);
@@ -100,9 +100,9 @@
   background: url("chosen-sprite.png") no-repeat -22px -3px;
 }
 .chosen-container-single .chosen-single {
-  background-color: #ffffff;
+  background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid #cccccc;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -166,8 +166,8 @@
   z-index: 1000;
 }
 .chosen-container-single .chosen-search input[type="text"] {
-  background: url("chosen-sprite.png") no-repeat 100% -20px, #ffffff;
-  border: 1px solid #cccccc;
+  background: url("chosen-sprite.png") no-repeat 100% -20px, #fff;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -188,8 +188,8 @@
   left: -9000px;
 }
 .chosen-container-multi .chosen-choices {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
+  background-color: #fff;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -228,7 +228,7 @@
 .chosen-container-multi .chosen-choices .search-choice {
   background-clip: padding-box;
   background-color: #eeeeee;
-  border: 1px solid #cccccc;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -274,7 +274,7 @@
   transition: border linear .2s, box-shadow linear .2s;
 }
 .chosen-container-active.chosen-with-drop .chosen-single {
-  background-color: #ffffff;
+  background-color: #fff;
   border: 1px solid #66afe9;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
@@ -359,7 +359,7 @@
   border-right: none;
 }
 .chosen-rtl .chosen-search input[type="text"] {
-  background: url("chosen-sprite.png") no-repeat -28px -20px, #ffffff;
+  background: url("chosen-sprite.png") no-repeat -28px -20px, #fff;
   direction: rtl;
   padding: 4px 5px 4px 20px;
 }

diff --git a/dist/angular-timezone-selector.js b/dist/angular-timezone-selector.js
diff --git a/dist/angular-timezone-selector.min.js b/dist/angular-timezone-selector.min.js
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/mishguruorg/angular-timezone-selector",
   "devDependencies": {
     "csv": "^0.4.1",
-    "csv-load-sync": "0.0.3",
+    "csv-load-sync": "^1.0.0",
     "grunt": "latest",
     "grunt-contrib-uglify": "latest",
     "grunt-string-replace": "~1.0.0",

diff --git a/styling/angular-timezone-selector.css b/styling/angular-timezone-selector.css
@@ -11,8 +11,8 @@
   vertical-align: middle;
 }
 .chosen-container .chosen-drop {
-  background: #ffffff;
-  border: 1px solid #cccccc;
+  background: #fff;
+  border: 1px solid #ccc;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
   box-shadow: 0 8px 8px rgba(0, 0, 0, .25);
@@ -100,9 +100,9 @@
   background: url("chosen-sprite.png") no-repeat -22px -3px;
 }
 .chosen-container-single .chosen-single {
-  background-color: #ffffff;
+  background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid #cccccc;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -166,8 +166,8 @@
   z-index: 1000;
 }
 .chosen-container-single .chosen-search input[type="text"] {
-  background: url("chosen-sprite.png") no-repeat 100% -20px, #ffffff;
-  border: 1px solid #cccccc;
+  background: url("chosen-sprite.png") no-repeat 100% -20px, #fff;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -188,8 +188,8 @@
   left: -9000px;
 }
 .chosen-container-multi .chosen-choices {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
+  background-color: #fff;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -228,7 +228,7 @@
 .chosen-container-multi .chosen-choices .search-choice {
   background-clip: padding-box;
   background-color: #eeeeee;
-  border: 1px solid #cccccc;
+  border: 1px solid #ccc;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -274,7 +274,7 @@
   transition: border linear .2s, box-shadow linear .2s;
 }
 .chosen-container-active.chosen-with-drop .chosen-single {
-  background-color: #ffffff;
+  background-color: #fff;
   border: 1px solid #66afe9;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
@@ -359,7 +359,7 @@
   border-right: none;
 }
 .chosen-rtl .chosen-search input[type="text"] {
-  background: url("chosen-sprite.png") no-repeat -28px -20px, #ffffff;
+  background: url("chosen-sprite.png") no-repeat -28px -20px, #fff;
   direction: rtl;
   padding: 4px 5px 4px 20px;
 }