Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Umbraco to 7.12.2

Browse Source
This commit is contained in:
James Kolpack
2018-09-16 15:08:47 -04:00
parent 7ed7776432
commit 616ab81bad
764 changed files with 142787 additions and 66790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Umbraco_Client/Application/Extensions.js
+29 -2
View File
@@ -27,6 +27,23 @@
};
}
if (!window.location.getParams) {
var pl = /\+/g; // Regex for replacing addition symbol with a space
var search = /([^&=]+)=?([^&]*)/g;
var decode = function(s) { return decodeURIComponent(s.replace(pl, " ")); };
window.location.getParams = function() {
var match;
var query = window.location.search.substring(1);
var urlParams = {};
while (match = search.exec(query))
urlParams[decode(match[1])] = decode(match[2]);
return urlParams;
}
}
if (!String.prototype.startsWith) {
String.prototype.startsWith = function (str) {
///<summary>startsWith extension method for string</summary>
@@ -366,10 +383,20 @@
function getCookie(name) {
var value = "; " + document.cookie;
var parts = value.split("; " + name + "=");
if (parts.length === 2) return parts.pop().split(";").shift();
if (parts.length === 2)
return parts.pop().split(";").shift();
return null;
}
xhr.setRequestHeader("X-XSRF-TOKEN", getCookie("XSRF-TOKEN"));
var cookieVal = getCookie("UMB-XSRF-TOKEN");
if (cookieVal) {
xhr.setRequestHeader("X-UMB-XSRF-TOKEN", cookieVal);
}
var queryString = window.location.getParams();
if (queryString.umbDebug === "true") {
xhr.setRequestHeader("X-UMB-DEBUG", cookieVal);
}
}
});
WebCms/Umbraco_Client/Application/UmbracoApplicationActions.js
+4 -58
View File
@@ -1,7 +1,6 @@
/// <reference path="/umbraco_client/Application/NamespaceManager.js" />
/// <reference path="UmbracoUtils.js" />
/// <reference path="/umbraco_client/modal/modal.js" />
/// <reference path="language.aspx" />
/// <reference name="MicrosoftAjax.js"/>
Umbraco.Sys.registerNamespace("Umbraco.Application");
@@ -38,27 +37,7 @@ Umbraco.Application.Actions = function() {
}
else alert(msg);
},
launchHelp: function(lang, userType) {
/// <summary>Launches the contextual help window</summary>
var rightUrl = UmbClientMgr.contentFrame().document.location.href.split("\/");
if (rightUrl.length > 0) {
rightUrl = rightUrl[rightUrl.length - 1];
}
if (rightUrl.indexOf("?") > 0) {
rightUrl = rightUrl.substring(0, rightUrl.indexOf("?"));
}
var url = "/umbraco/helpRedirect.aspx?Application=" + this._currApp + '&ApplicationURL=' + rightUrl + '&Language=' + lang + "&UserType=" + userType;
window.open(url);
return false;
},
launchAbout: function() {
/// <summary>Launches the about Umbraco window</summary>
UmbClientMgr.openModalWindow("dialogs/about.aspx", UmbClientMgr.uiKeys()['general_about'], true, 450, 390);
return false;
},
launchCreateWizard: function() {
/// <summary>Launches the create content wizard</summary>
@@ -208,15 +187,7 @@ Umbraco.Application.Actions = function() {
}
},
actionRights: function() {
/// <summary></summary>
if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
UmbClientMgr.openModalWindow("dialogs/cruds.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_rights'], true, 800, 300);
}
},
actionProtect: function() {
/// <summary></summary>
@@ -304,10 +275,7 @@ Umbraco.Application.Actions = function() {
}
else if (actionNode.nodeType == "users") {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 480, 380);
}
else if (actionNode.nodeType == "initpython" || actionNode.nodeType == "initdlrscripting") {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380);
}
}
else {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 270);
}
@@ -329,14 +297,7 @@ Umbraco.Application.Actions = function() {
UmbClientMgr.openModalWindow("dialogs/sendToTranslation.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_sendToTranslate'], true, 500, 470);
}
},
actionEmptyTranscan: function() {
/// <summary></summary>
if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
UmbClientMgr.openModalWindow("dialogs/emptyTrashcan.aspx?type=" + this._currApp, uiKeys['actions_emptyTrashcan'], true, 500, 220);
}
},
actionImport: function() {
/// <summary></summary>
@@ -427,21 +388,6 @@ Umbraco.Application.Actions = function() {
}
},
actionMove: function() {
/// <summary></summary>
if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
UmbClientMgr.openModalWindow("dialogs/moveOrCopy.aspx?app=" + this._currApp + "&mode=cut&id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_move'], true, 500, 460);
}
},
actionCopy: function() {
/// <summary></summary>
if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
UmbClientMgr.openModalWindow("dialogs/moveOrCopy.aspx?app=" + this._currApp + "&mode=copy&id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_copy'], true, 500, 470);
}
},
_debug: function(strMsg) {
if (this._isDebug) {
Sys.Debug.trace("AppActions: " + strMsg);
WebCms/Umbraco_Client/Application/UmbracoClientManager.js
+2 -2
View File
@@ -172,9 +172,9 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
},
reloadLocation: function () {
reloadLocation: function (pathToMatch) {
if (this.mainWindow().UmbClientMgr) {
this.mainWindow().UmbClientMgr.reloadLocation();
this.mainWindow().UmbClientMgr.reloadLocation(pathToMatch);
}
},
WebCms/Umbraco_Client/Datepicker/Aqua/theme.css
+1 -1
View File
@@ -97,7 +97,7 @@ div.calendar { position: relative; border: 2px solid #CAC9C9;}
.calendar tbody .rowhilite td.wn {
}
.calendar tbody td.today { font-weight: bold; /* background: url("today-bg.gif") no-repeat 70% 50%; */ }
.calendar tbody td.today { font-weight: bold; }
.calendar tbody td.hilite { /* Hovered cells <TD> */
padding: 1px 3px 1px 1px;
WebCms/Umbraco_Client/Dialogs/SortDialog.js
+1
View File
@@ -105,6 +105,7 @@
//wire up the submit button
self._opts.submitButton.click(function() {
this.disabled = true;
self._saveSort();
});
WebCms/Umbraco_Client/Editors/EditXslt.js
+1 -1
View File
@@ -37,7 +37,7 @@
codeVal = UmbEditor.GetCode();
}
umbraco.presentation.webservices.codeEditorSave.SaveXslt(
fileName, self._opts.originalFileName, codeVal, self._opts.skipTestingCheckBox.is(':checked'),
fileName, self._opts.originalFileName, codeVal, true,
function (t) { self.submitSucces(t); },
function (t) { self.submitFailure(t); });
WebCms/Umbraco_Client/Tree/jquery.tree.contextmenu.js
+1 -1
View File
@@ -48,7 +48,7 @@
if (opts.items[i].separator_before === true) str += "<li class='separator'><span>&nbsp;</span></li>";
str += '<li><a href="#" rel="' + i + '" class="' + i + ' ' + (r == 0 ? 'disabled' : '') + '">';
// updated from patch by Matt Brailsford (http://our.umbraco.org/forum/using/ui-questions/6225-Custom-icon-in-Context-menu#comment39514)
// updated from patch by Matt Brailsford (https://our.umbraco.com/forum/using/ui-questions/6225-Custom-icon-in-Context-menu#comment39514)
str += "<ins> </ins>"; str += "<span>";
if (opts.items[i].icon && opts.items[i].icon.indexOf("/") >= 0) {
str += "<div class=\"menuSpr\" style=\"background:transparent url('" + opts.items[i].icon + "') center center no-repeat;\"></div><div class='menuLabel'>" + opts.items[i].label + "</div>";