From f852ed7faad731f0b97ae82562ca1acd896ecdc4 Mon Sep 17 00:00:00 2001 From: Lighthouse Nguyen Date: Tue, 15 Dec 2015 09:09:35 +0700 Subject: [PATCH 1/4] update viewMode and minViewMode viewMode="years", minViewMode="years", format="YYYY"; viewMode="months", minViewMode="months", format="MM"; viewMode="months", minViewMode="months", format="MM YYYY"; --- example/demo.html | 17 +++++++++++++++++ example/js/ng-bs3-datepicker.js | 12 +++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/example/demo.html b/example/demo.html index f62044e..e466e1b 100644 --- a/example/demo.html +++ b/example/demo.html @@ -11,6 +11,23 @@
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
diff --git a/example/js/ng-bs3-datepicker.js b/example/js/ng-bs3-datepicker.js index 2be5a87..b0f346a 100644 --- a/example/js/ng-bs3-datepicker.js +++ b/example/js/ng-bs3-datepicker.js @@ -9,8 +9,10 @@ dp.directive('ngBs3Datepicker', function($compile) { replace: true, template: "
\n \n \n \n \n
", link: function($scope, element, attr) { - var attributes, dateFormat, input, resetValue; + var attributes, dateFormat, input, resetValue, dateViewMode, dateMinViewMode; dateFormat = ""; + dateViewMode = ""; + dateMinViewMode = ""; attributes = element.prop("attributes"); input = element.find("input"); resetValue = false; @@ -21,6 +23,12 @@ dp.directive('ngBs3Datepicker', function($compile) { if (e.name === "date-format") { return dateFormat = e.value; } + if (e.name === "date-view-mode") { + return dateViewMode = e.value; + } + if (e.name === "date-min-view-mode") { + return dateMinViewMode = e.value; + } }); $scope.$watch(attr.language, function(value) { var language; @@ -29,6 +37,8 @@ dp.directive('ngBs3Datepicker', function($compile) { language: language, pickTime: false, format: dateFormat, + viewMode: dateViewMode, + minViewMode: dateMinViewMode, icons: { time: 'fa fa-clock-o', date: 'fa fa-calendar', From 81889731ac7b76b623bdd64677a748ecf04d72bf Mon Sep 17 00:00:00 2001 From: Lighthouse Nguyen Date: Tue, 15 Dec 2015 09:18:24 +0700 Subject: [PATCH 2/4] Revert "update viewMode and minViewMode" This reverts commit f852ed7faad731f0b97ae82562ca1acd896ecdc4. --- example/demo.html | 17 ----------------- example/js/ng-bs3-datepicker.js | 12 +----------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/example/demo.html b/example/demo.html index e466e1b..f62044e 100644 --- a/example/demo.html +++ b/example/demo.html @@ -11,23 +11,6 @@
-
- - -
- -
- - -
- -
- - -
- -
-
diff --git a/example/js/ng-bs3-datepicker.js b/example/js/ng-bs3-datepicker.js index b0f346a..2be5a87 100644 --- a/example/js/ng-bs3-datepicker.js +++ b/example/js/ng-bs3-datepicker.js @@ -9,10 +9,8 @@ dp.directive('ngBs3Datepicker', function($compile) { replace: true, template: "
\n \n \n \n \n
", link: function($scope, element, attr) { - var attributes, dateFormat, input, resetValue, dateViewMode, dateMinViewMode; + var attributes, dateFormat, input, resetValue; dateFormat = ""; - dateViewMode = ""; - dateMinViewMode = ""; attributes = element.prop("attributes"); input = element.find("input"); resetValue = false; @@ -23,12 +21,6 @@ dp.directive('ngBs3Datepicker', function($compile) { if (e.name === "date-format") { return dateFormat = e.value; } - if (e.name === "date-view-mode") { - return dateViewMode = e.value; - } - if (e.name === "date-min-view-mode") { - return dateMinViewMode = e.value; - } }); $scope.$watch(attr.language, function(value) { var language; @@ -37,8 +29,6 @@ dp.directive('ngBs3Datepicker', function($compile) { language: language, pickTime: false, format: dateFormat, - viewMode: dateViewMode, - minViewMode: dateMinViewMode, icons: { time: 'fa fa-clock-o', date: 'fa fa-calendar', From 25cb0fd85c954cc3da5ab0bc516ac84384585491 Mon Sep 17 00:00:00 2001 From: Lighthouse Nguyen Date: Wed, 16 Dec 2015 11:24:34 +0700 Subject: [PATCH 3/4] Revert "Revert "update viewMode and minViewMode"" This reverts commit 81889731ac7b76b623bdd64677a748ecf04d72bf. --- example/demo.html | 17 +++++++++++++++++ example/js/ng-bs3-datepicker.js | 12 +++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/example/demo.html b/example/demo.html index f62044e..e466e1b 100644 --- a/example/demo.html +++ b/example/demo.html @@ -11,6 +11,23 @@
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
diff --git a/example/js/ng-bs3-datepicker.js b/example/js/ng-bs3-datepicker.js index 2be5a87..b0f346a 100644 --- a/example/js/ng-bs3-datepicker.js +++ b/example/js/ng-bs3-datepicker.js @@ -9,8 +9,10 @@ dp.directive('ngBs3Datepicker', function($compile) { replace: true, template: "
\n \n \n \n \n
", link: function($scope, element, attr) { - var attributes, dateFormat, input, resetValue; + var attributes, dateFormat, input, resetValue, dateViewMode, dateMinViewMode; dateFormat = ""; + dateViewMode = ""; + dateMinViewMode = ""; attributes = element.prop("attributes"); input = element.find("input"); resetValue = false; @@ -21,6 +23,12 @@ dp.directive('ngBs3Datepicker', function($compile) { if (e.name === "date-format") { return dateFormat = e.value; } + if (e.name === "date-view-mode") { + return dateViewMode = e.value; + } + if (e.name === "date-min-view-mode") { + return dateMinViewMode = e.value; + } }); $scope.$watch(attr.language, function(value) { var language; @@ -29,6 +37,8 @@ dp.directive('ngBs3Datepicker', function($compile) { language: language, pickTime: false, format: dateFormat, + viewMode: dateViewMode, + minViewMode: dateMinViewMode, icons: { time: 'fa fa-clock-o', date: 'fa fa-calendar', From a0d62be6e5c364d74533f6ee273b1b1afa2bb806 Mon Sep 17 00:00:00 2001 From: Lighthouse Nguyen Date: Thu, 28 Jan 2016 17:33:04 +0700 Subject: [PATCH 4/4] set default date Instead of using default-date attribute in html element, i used $scope.ngmodenameDefaultdate. And add code in .js file. --- example/demo.html | 6 +++--- example/js/ng-bs3-datepicker.js | 21 +++++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/example/demo.html b/example/demo.html index e466e1b..dca0a85 100644 --- a/example/demo.html +++ b/example/demo.html @@ -13,12 +13,12 @@
- +
- +
@@ -30,7 +30,7 @@
- +
diff --git a/example/js/ng-bs3-datepicker.js b/example/js/ng-bs3-datepicker.js index b0f346a..f24e72d 100644 --- a/example/js/ng-bs3-datepicker.js +++ b/example/js/ng-bs3-datepicker.js @@ -9,25 +9,29 @@ dp.directive('ngBs3Datepicker', function($compile) { replace: true, template: "
\n \n \n \n \n
", link: function($scope, element, attr) { - var attributes, dateFormat, input, resetValue, dateViewMode, dateMinViewMode; + var attributes, dateFormat, input, resetValue, dateViewMode, dateMinViewMode, defaultDate; dateFormat = ""; - dateViewMode = ""; + dateViewMode=""; dateMinViewMode = ""; + defaultDate = ""; attributes = element.prop("attributes"); input = element.find("input"); resetValue = false; angular.forEach(attributes, function(e) { if (e.name !== "class") { - input.attr(e.name, e.value); + input.attr(e.name, e.value); } if (e.name === "date-format") { - return dateFormat = e.value; + dateFormat = e.value; } - if (e.name === "date-view-mode") { - return dateViewMode = e.value; + if(e.name === "date-view-mode") { + dateViewMode = e.value; } - if (e.name === "date-min-view-mode") { - return dateMinViewMode = e.value; + if(e.name === "date-min-view-mode") { + dateMinViewMode = e.value; + } + if(e.name === "default-date") { + defaultDate = e.value; } }); $scope.$watch(attr.language, function(value) { @@ -39,6 +43,7 @@ dp.directive('ngBs3Datepicker', function($compile) { format: dateFormat, viewMode: dateViewMode, minViewMode: dateMinViewMode, + defaultDate: $scope.startdate, icons: { time: 'fa fa-clock-o', date: 'fa fa-calendar',