fix now and today utc; made usable with every elem (not only input)

simonered · Jan 12, 2017 · fd88bc5 · fd88bc5
1 parent 0ba63ad
commit fd88bc5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "mdPickers",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "homepage": "https://github.com/simonered/mdPickers",
   "authors": [
     "simonered"

diff --git a/dist/mdPickers.js b/dist/mdPickers.js
@@ -66,7 +66,7 @@ function DatePickerCtrl($scope, $mdDialog, $mdMedia, $timeout, currentDate, minD
     			return undefined;
     		}
 
-    		m = (useUtc || utcOffset) ? moment().utc(true) : moment();
+    		m = useUtc || utcOffset ? moment().utc(true) : moment();
     	}
 
     	m = moment.isMoment(m) ? m : moment(m); 
@@ -99,7 +99,7 @@ function DatePickerCtrl($scope, $mdDialog, $mdMedia, $timeout, currentDate, minD
     };
 
     this.today = function() {
-    	self.currentMoment = this.normalizeMoment(moment());
+    	self.currentMoment = this.normalizeMoment();
     	this.selectYear(self.currentMoment.year());
     };
 
@@ -419,7 +419,7 @@ function TimePickerCtrl($scope, $mdDialog, $mdMedia, time, autoSwitch, useUtc, u
     			return undefined;
     		}
 
-    		m = (useUtc || utcOffset) ? moment().utc(true) : moment();
+    		m = useUtc || utcOffset ? moment().utc(true) : moment();
     	}
 
     	if (useUtc) {
@@ -450,7 +450,7 @@ function TimePickerCtrl($scope, $mdDialog, $mdMedia, time, autoSwitch, useUtc, u
 	};
 
 	this.now = function() {
-		self.time = this.normalizeMoment(moment());
+		self.time = this.normalizeMoment();
 	};
 
     this.cancel = function() {
@@ -873,8 +873,14 @@ module.directive("mdpTimePicker", ["$mdpTimePicker", "$timeout", function($mdpTi
 	    	            	return m;
 	    	            };
 
-	                    ngModel.$setViewValue(normalizeMoment(moment(time)).format(scope.timeFormat));
-	                    ngModel.$render();
+	    	            if (element[0].tagName == "input") {
+		                    ngModel.$setViewValue(normalizeMoment(time).format(scope.timeFormat));
+
+	    	            } else {
+	    	            	ngModel.$setViewValue(normalizeMoment(time).toDate());
+	    	            }
+
+	    	            ngModel.$render();
 	                });
 	            };
 

diff --git a/dist/mdPickers.min.js b/dist/mdPickers.min.js
diff --git a/dist/mdPickers.min.js.map b/dist/mdPickers.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mdPickers",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Fork of alenaksu/mdPickers: Material Design date/time pickers for Angular Material",
   "main": "gulpfile.js",
   "scripts": {

diff --git a/src/components/mdDatePicker/mdDatePicker.js b/src/components/mdDatePicker/mdDatePicker.js
@@ -59,7 +59,7 @@ function DatePickerCtrl($scope, $mdDialog, $mdMedia, $timeout, currentDate, minD
     			return undefined;
     		}
 
-    		m = (useUtc || utcOffset) ? moment().utc(true) : moment();
+    		m = useUtc || utcOffset ? moment().utc(true) : moment();
     	}
 
     	m = moment.isMoment(m) ? m : moment(m); 
@@ -92,7 +92,7 @@ function DatePickerCtrl($scope, $mdDialog, $mdMedia, $timeout, currentDate, minD
     };
 
     this.today = function() {
-    	self.currentMoment = this.normalizeMoment(moment());
+    	self.currentMoment = this.normalizeMoment();
     	this.selectYear(self.currentMoment.year());
     };
 

diff --git a/src/components/mdTimePicker/mdTimePicker.js b/src/components/mdTimePicker/mdTimePicker.js
@@ -21,7 +21,7 @@ function TimePickerCtrl($scope, $mdDialog, $mdMedia, time, autoSwitch, useUtc, u
     			return undefined;
     		}
 
-    		m = (useUtc || utcOffset) ? moment().utc(true) : moment();
+    		m = useUtc || utcOffset ? moment().utc(true) : moment();
     	}
 
     	if (useUtc) {
@@ -52,7 +52,7 @@ function TimePickerCtrl($scope, $mdDialog, $mdMedia, time, autoSwitch, useUtc, u
 	};
 
 	this.now = function() {
-		self.time = this.normalizeMoment(moment());
+		self.time = this.normalizeMoment();
 	};
 
     this.cancel = function() {
@@ -475,8 +475,14 @@ module.directive("mdpTimePicker", ["$mdpTimePicker", "$timeout", function($mdpTi
 	    	            	return m;
 	    	            };
 
-	                    ngModel.$setViewValue(normalizeMoment(moment(time)).format(scope.timeFormat));
-	                    ngModel.$render();
+	    	            if (element[0].tagName == "input") {
+		                    ngModel.$setViewValue(normalizeMoment(time).format(scope.timeFormat));
+
+	    	            } else {
+	    	            	ngModel.$setViewValue(normalizeMoment(time).toDate());
+	    	            }
+
+	    	            ngModel.$render();
 	                });
 	            };