yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/routes.js
This commit is contained in:
Per Ploug Krogslund
2013-08-14 14:30:23 +02:00
parent 99d41ca63a 4a8026c902
commit f13d5c48fe
88 changed files with 1497 additions and 1520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
View File

@@ -5,7 +5,7 @@
/** Converts a Date object to a globally acceptable ISO string, NOTE: This is different from the built in
JavaScript toISOString method which returns date/time like "2013-08-07T02:04:11.487Z" but we want "yyyy-MM-dd HH:mm:ss" */
Date.prototype.toIsoDateTimeString = function (str) {
var month = this.getMonth().toString();
var month = (this.getMonth() + 1).toString();
if (month.length === 1) {
month = "0" + month;
}
@@ -28,6 +28,23 @@
return this.getFullYear() + "-" + month + "-" + day + " " + hour + ":" + mins + ":" + secs;
};
}
if (!Date.prototype.toIsoDateString) {
/** Converts a Date object to a globally acceptable ISO string, NOTE: This is different from the built in
JavaScript toISOString method which returns date/time like "2013-08-07T02:04:11.487Z" but we want "yyyy-MM-dd" */
Date.prototype.toIsoDateString = function (str) {
var month = (this.getMonth() + 1).toString();
if (month.length === 1) {
month = "0" + month;
}
var day = this.getDate().toString();
if (day.length === 1) {
day = "0" + day;
}
return this.getFullYear() + "-" + month + "-" + day;
};
}
//create guid method on the String
if (String.CreateGuid == null) {