This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 118da7b7f46d271c82f121952cb00f363b6dbecc Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 7 12:57:07 2014 +0200 upgrade bootstrap datetimepicker and use momentjs 2.8.1 --- pollen-ui-angular/bower.json | 3 ++- pollen-ui-angular/src/main/webapp/index.html | 4 ++-- pollen-ui-angular/src/main/webapp/js/directives.js | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 3df46f2..a3e2dbb 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -21,7 +21,8 @@ "less": "1.7.3", "jqplot-bower": "1.0.8", "spin.js": "2.0.1", - "eonasdan-bootstrap-datetimepicker": "3.0.0" + "moment": "2.8.1", + "bootstrap-datetimepicker": "dralagen/bootstrap-datetimepicker#3.0.3" }, "devDependencies": { "angular-mocks": "1.2.16" diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 708d13f..0925d08 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -59,9 +59,9 @@ <script language="javascript" type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script language="javascript" type="text/javascript" src="lib/moment/min/moment.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/moment/min/langs.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/moment/min/locales.min.js"></script> <script language="javascript" type="text/javascript" src="lib/bootstrap/dist/js/bootstrap.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script> <script language="javascript" type="text/javascript" src="js/app.js"></script> <script language="javascript" type="text/javascript" src="js/directives.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 92b4eb7..b7dc0db 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -242,7 +242,6 @@ angular.module('pollenDirective', []) }); element.bind('dp.show', function() { - console.log('is open'); scope.lock = true; }) @@ -538,7 +537,7 @@ angular.module('pollenDirective', []) var setMinDate = function () { if (angular.isDefined(scope.minDate)) { - scope.dateTimePicker.data("DateTimePicker").setMinDate(moment(scope.minDate).subtract('day', 1)); + scope.dateTimePicker.data("DateTimePicker").setMinDate(moment(scope.minDate)); } }; setMinDate(); @@ -552,7 +551,7 @@ angular.module('pollenDirective', []) var setMaxDate = function () { if (angular.isDefined(scope.maxDate)) { - scope.dateTimePicker.data("DateTimePicker").setMaxDate(moment(scope.maxDate).add('day', 1)); + scope.dateTimePicker.data("DateTimePicker").setMaxDate(moment(scope.maxDate)); } }; setMaxDate(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.