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 95b50385033f0c9eb19945bc8f23c02e2cfa3cac Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 8 16:07:28 2014 +0200 update dateTimePicker --- pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/directives.js | 31 +++++++++++++++++----- .../src/main/webapp/partials/dateTimePicker.html | 6 ++++- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index a3e2dbb..500a4db 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -22,7 +22,7 @@ "jqplot-bower": "1.0.8", "spin.js": "2.0.1", "moment": "2.8.1", - "bootstrap-datetimepicker": "dralagen/bootstrap-datetimepicker#3.0.3" + "bootstrap-datetimepicker": "dralagen/bootstrap-datetimepicker" }, "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 0925d08..ee23285 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -25,7 +25,7 @@ <meta charset="utf-8" /> <link rel="stylesheet" type="text/css" href="lib/bootstrap/dist/css/bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" href="lib/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" /> + <link rel="stylesheet" type="text/css" href="lib/bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" /> <link rel="stylesheet" type="text/css" href="lib/jqplot-bower/dist//jquery.jqplot.min.css" /> <!-- TODO : compile less to css $ lessc -x less/style.less css/style.css diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index b7dc0db..dd40593 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -526,7 +526,8 @@ angular.module('pollenDirective', []) link: function(scope, element, attrs) { scope.dateTimePicker = $(element).find(".datetimepicker"); scope.dateTimePicker.datetimepicker({ - language: SessionStorage.get().locale + language: SessionStorage.get().locale, + showPickOnFocus: true }); var setDate = function () { @@ -575,20 +576,36 @@ angular.module('pollenDirective', []) }); }); - scope.dateTimePicker.on("dp.show", function (e) { - if (angular.isUndefined(scope.ngModel) || scope.ngModel == null) { - scope.ngModel = scope.dateTimePicker.data("DateTimePicker").setDate(moment()); + scope.dateTimePicker.on("change", function(e) { + var newDate = scope.dateTimePicker.data("DateTimePicker").getDate(); + if (newDate != null) { + scope.ngModel = new Date(scope.dateTimePicker.data("DateTimePicker").getDate().format()).getTime(); + } else { + scope.ngModel = null; } - }) + }); - scope.dateTimePicker.on("dp.change", function(e) { - scope.ngModel = new Date(scope.dateTimePicker.data("DateTimePicker").getDate().format()).getTime(); + scope.dateTimePicker.on("dp.show", function() { + // hide other datetimepicker + var id = scope.dateTimePicker.data("DateTimePicker").id; + var allDp = $('.datetimepicker'); + for (var i = 0; i < allDp.length; i++) { + var dp = $(allDp[i]).data("DateTimePicker") + if (dp.id == id) { + continue; + } + dp.hide(); + } }); scope.exit = function() { element.trigger("blur"); } + scope.remove = function () { + scope.ngModel = null; + scope.dateTimePicker.data("DateTimePicker").setDate(null); + } } }; diff --git a/pollen-ui-angular/src/main/webapp/partials/dateTimePicker.html b/pollen-ui-angular/src/main/webapp/partials/dateTimePicker.html index 857fb78..a4d7693 100644 --- a/pollen-ui-angular/src/main/webapp/partials/dateTimePicker.html +++ b/pollen-ui-angular/src/main/webapp/partials/dateTimePicker.html @@ -1,6 +1,10 @@ <div class="input-group date datetimepicker"> <input type="text" class="form-control" focus-me="focus" ng-exit="exit()" id="{{forId}}" /> - <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span> + <span class="input-group-addon datepickerbutton"> + <span class="glyphicon glyphicon-calendar"></span> + </span> + <span class="input-group-addon" ng-click="remove()"> + <span class="glyphicon glyphicon-remove"></span> </span> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.