From 666b89966350bf9aa1e0454f43c839e2c46ede19 Mon Sep 17 00:00:00 2001 From: frostbolt Date: Tue, 30 Apr 2019 22:52:37 +0300 Subject: [PATCH 1/2] Update several dependencies. Rewrite map method using .forEach method --- bower.json | 2 +- dist/angular-eonasdan-datetimepicker.js | 4 ++-- dist/angular-eonasdan-datetimepicker.min.js | 2 +- package.json | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bower.json b/bower.json index cb0d2f2..c3cfbe0 100644 --- a/bower.json +++ b/bower.json @@ -31,6 +31,6 @@ "bootstrap": "*", "eonasdan-bootstrap-datetimepicker": "~4", "moment": "*", - "jquery": "~2" + "jquery": "^3.4.0" } } \ No newline at end of file diff --git a/dist/angular-eonasdan-datetimepicker.js b/dist/angular-eonasdan-datetimepicker.js index dd47713..c6f8a10 100644 --- a/dist/angular-eonasdan-datetimepicker.js +++ b/dist/angular-eonasdan-datetimepicker.js @@ -19,8 +19,8 @@ $scope.$watch('options', function (newValue) { var dtp = dpElement.data('DateTimePicker'); - $.map(newValue, function (value, key) { - dtp[key](value); + Object.keys(newValue).forEach(function (key) { + dtp[key](newValue[key]); }); }, true); diff --git a/dist/angular-eonasdan-datetimepicker.min.js b/dist/angular-eonasdan-datetimepicker.min.js index 11cdcde..be12d41 100644 --- a/dist/angular-eonasdan-datetimepicker.min.js +++ b/dist/angular-eonasdan-datetimepicker.min.js @@ -1 +1 @@ -!function(){"use strict";var e=angular.module("ae-datetimepicker",[]);e.directive("datetimepicker",["$timeout",function(e){return{restrict:"EA",require:"ngModel",scope:{options:"=?",onChange:"&?",onClick:"&?"},link:function(t,n,i,a){var o=n.parent().hasClass("input-group")?n.parent():n;t.$watch("options",function(e){var t=o.data("DateTimePicker");$.map(e,function(e,n){t[n](e)})},!0),a.$render=function(){var e=o.data("DateTimePicker").date();!a.$viewValue&&e?o.data("DateTimePicker").clear():a.$viewValue&&(moment.isMoment(a.$viewValue)||a.$setViewValue(moment(a.$viewValue)),o.data("DateTimePicker").date(a.$viewValue))};var u=function(e,t){return moment.isMoment(e)&&moment.isMoment(t)&&e.valueOf()===t.valueOf()};o.on("dp.change",function(n){if(!u(n.date,a.$viewValue)){var i=n.date===!1?null:n.date;a.$setViewValue(i),e(function(){"function"==typeof t.onChange&&t.onChange()})}}),o.on("click",function(){e(function(){"function"==typeof t.onClick&&t.onClick()})}),o.datetimepicker(t.options)}}}])}(); \ No newline at end of file +!function(){"use strict";var e=angular.module("ae-datetimepicker",[]);e.directive("datetimepicker",["$timeout",function(e){return{restrict:"EA",require:"ngModel",scope:{options:"=?",onChange:"&?",onClick:"&?"},link:function(t,n,i,a){var o=n.parent().hasClass("input-group")?n.parent():n;t.$watch("options",function(e){var t=o.data("DateTimePicker");Object.keys(e).forEach(function(n){t[n](e[n])})},!0),a.$render=function(){var e=o.data("DateTimePicker").date();!a.$viewValue&&e?o.data("DateTimePicker").clear():a.$viewValue&&(moment.isMoment(a.$viewValue)||a.$setViewValue(moment(a.$viewValue)),o.data("DateTimePicker").date(a.$viewValue))};var c=function(e,t){return moment.isMoment(e)&&moment.isMoment(t)&&e.valueOf()===t.valueOf()};o.on("dp.change",function(n){if(!c(n.date,a.$viewValue)){var i=n.date===!1?null:n.date;a.$setViewValue(i),e(function(){"function"==typeof t.onChange&&t.onChange()})}}),o.on("click",function(){e(function(){"function"==typeof t.onClick&&t.onClick()})}),o.datetimepicker(t.options)}}}])}(); \ No newline at end of file diff --git a/package.json b/package.json index 46dc393..d72bf89 100644 --- a/package.json +++ b/package.json @@ -31,28 +31,28 @@ "bootstrap": "*", "eonasdan-bootstrap-datetimepicker": "~4", "moment": "*", - "jquery": "~2" + "jquery": "^3.4.0" }, "devDependencies": { "concurrently": "^3.5.0", "gulp": "3.9.1", - "gulp-angular-protractor": "1.0.0", "gulp-debug": "^2.1.2", "gulp-jshint": "^2.0.0", "gulp-ng-annotate": "^1.1.0", "gulp-rename": "^1.2.2", "gulp-uglify": "^1.5.1", - "http-server": "^0.9.0", + "http-server": "^0.11.1", "jasmine-reporters": "2.2.0", - "jshint": "^2.9.1", - "protractor": "4.0.11", - "webdriver-manager": "10.2.8" + "jshint": "^2.9.1" }, "dependencies": { "angular": "^1.6.1", "bootstrap": "^3.3.7", "eonasdan-bootstrap-datetimepicker": "^4.17.46", - "jquery": "^2.2.4", - "moment": "^2.17.1" + "gulp-angular-protractor": "^2.0.0", + "jquery": "^3.4.0", + "moment": "^2.17.1", + "protractor": "^5.4.2", + "webdriver-manager": "^12.1.3" } } From 508be2dbc3efb5c4e4edc088f3c374008b8ede07 Mon Sep 17 00:00:00 2001 From: Sergey Luschik Date: Tue, 7 May 2019 17:25:30 +0300 Subject: [PATCH 2/2] fix dependencies & script runner comands --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index d72bf89..1e3c44a 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,9 @@ "homepage": "https://github.com/atais/angular-eonasdan-datetimepicker", "scripts": { "pretest": "npm install", - "test": "concurrently -k -s first 'npm start' 'gulp protractor'", + "test": "concurrently -k -s first \"npm start\" \"gulp protractor\"", "start": "http-server -a localhost -p 8000 -c-1 ./", - "dev": "concurrently -k 'npm start' 'gulp dev'" + "dev": "concurrently -k \"npm start\" \"gulp dev\"" }, "peerDependencies": { "angular": "*", @@ -36,6 +36,7 @@ "devDependencies": { "concurrently": "^3.5.0", "gulp": "3.9.1", + "gulp-angular-protractor": "^2.0.0", "gulp-debug": "^2.1.2", "gulp-jshint": "^2.0.0", "gulp-ng-annotate": "^1.1.0", @@ -43,16 +44,15 @@ "gulp-uglify": "^1.5.1", "http-server": "^0.11.1", "jasmine-reporters": "2.2.0", - "jshint": "^2.9.1" + "jshint": "^2.9.1", + "protractor": "^5.4.2", + "webdriver-manager": "^12.1.4" }, "dependencies": { "angular": "^1.6.1", "bootstrap": "^3.3.7", "eonasdan-bootstrap-datetimepicker": "^4.17.46", - "gulp-angular-protractor": "^2.0.0", "jquery": "^3.4.0", - "moment": "^2.17.1", - "protractor": "^5.4.2", - "webdriver-manager": "^12.1.3" + "moment": "^2.17.1" } }