diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5c3403d0c0..e72fa9874f 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -357,9 +357,6 @@
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/NamespaceManager.js b/src/Umbraco.Web.UI/umbraco_client/Application/NamespaceManager.js
deleted file mode 100644
index 9d4b86b2ba..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/Application/NamespaceManager.js
+++ /dev/null
@@ -1,17 +0,0 @@
-if (typeof Umbraco == 'undefined') var Umbraco = {};
-if (!Umbraco.Sys) Umbraco.Sys = {};
-
-Umbraco.Sys.registerNamespace = function(namespace) {
- ///
- /// Used to easily register namespaces for classes without doing the syntax listed on line 1/2 for each class.
- /// Pretty much the same as ASP.NET's Type.registerNamespace, except in order to use it, you must register
- /// all of your scripts with ScriptManager, this class doesn't require this.
- ///
- namespace = namespace.split('.');
- if (!window[namespace[0]]) window[namespace[0]] = {};
- var strFullNamespace = namespace[0];
- for (var i = 1; i < namespace.length; i++) {
- strFullNamespace += "." + namespace[i];
- eval("if(!window." + strFullNamespace + ")window." + strFullNamespace + "={};");
- }
-};
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
deleted file mode 100644
index 6280b19554..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
+++ /dev/null
@@ -1,366 +0,0 @@
-Umbraco.Sys.registerNamespace("Umbraco.Application");
-
-Umbraco.Application.Actions = function() {
- ///
- /// Application actions actions for the context menu, help dialogs, logout, etc...
- /// This class supports an event listener model. Currently the available events are:
- /// "nodeDeleting","nodeDeleted","nodeRefresh"
- ///
-
- return {
- _utils: Umbraco.Utils, //alias to Umbraco Utils
- _dialogWindow: null,
- /// A reference to a dialog window to open, any action that doesn't open in an overlay, opens in a dialog
- _isDebug: false, //set to true to enable alert debugging
- _windowTitle: " - Umbraco CMS - ",
- _currApp: "",
- _isSaving: "",
-
- addEventHandler: function(fnName, fn) {
- /// Adds an event listener to the event name event
- if (typeof(jQuery) != "undefined") jQuery(window.top).bind(fnName, fn); //if there's no jQuery, there is no events
- },
-
- removeEventHandler: function(fnName, fn) {
- /// Removes an event listener to the event name event
- if (typeof(jQuery) != "undefined") jQuery(window.top).unbind(fnName, fn); //if there's no jQuery, there is no events
- },
-
- showSpeachBubble: function(ico, hdr, msg) {
- if (typeof(UmbClientMgr.mainWindow().UmbSpeechBubble) != "undefined") {
- UmbClientMgr.mainWindow().UmbSpeechBubble.ShowMessage(ico, hdr, msg);
- }
- else alert(msg);
- },
-
- launchCreateWizard: function() {
- /// Launches the create content wizard
-
- if (this._currApp == 'media' || this._currApp == 'content' || this._currApp == '') {
- if (this._currApp == '') {
- this._currApp = 'content';
- }
-
- UmbClientMgr.openModalWindow("dialogs/create.aspx?nodeType=" + this._currApp + "&app=" + this._currApp + "&rnd=" + this._utils.generateRandom(), UmbClientMgr.uiKeys()['actions_create'] + " " + this._currApp, true, 620, 470);
- return false;
-
- }
- else
- alert('Not supported - please create by right clicking the parentnode and choose new...');
- },
-
- logout: function(t) {
-
- if (!t) {
- throw "The security token must be set in order to log a user out using this method";
- }
-
- if (confirm(UmbClientMgr.uiKeys()["defaultdialogs_confirmlogout"])) {
- //raise beforeLogout event
- jQuery(window.top).trigger("beforeLogout", []);
-
- document.location.href = 'logout.aspx?t=' + t;
- }
- return false;
- },
-
- submitDefaultWindow: function() {
-
- if (!this._isSaving) {
- this._isSaving = true;
-
- //v6 way
- var link = jQuery(".btn[id*=save]:first, .editorIcon[id*=save]:first, .editorIcon:input:image[id*=Save]:first");
-
- //this is made of bad, to work around webforms horrible wiring
- if(!link.hasClass("client-side") && link.attr("href").indexOf("javascript:") == 0){
- eval(link.attr('href').replace('javascript:',''));
- }else{
- link.click();
- }
- }
- this._isSaving = false;
- return false;
- },
-
- bindSaveShortCut: function () {
-
- var keys = "ctrl+s";
- if (navigator.platform.toUpperCase().indexOf('MAC') >= 0) {
- keys = "meta+s";
- }
-
- jQuery(document).bind('keydown', keys, function (evt) { UmbClientMgr.appActions().submitDefaultWindow(); return false; });
- jQuery(":input").bind('keydown', keys, function (evt) { UmbClientMgr.appActions().submitDefaultWindow(); return false; });
- },
-
- shiftApp: function (whichApp, appName) {
- /// Changes the application
-
- this._debug("shiftApp: " + whichApp + ", " + appName);
-
- UmbClientMgr.mainTree().saveTreeState(this._currApp == "" ? "content" : this._currApp);
-
- this._currApp = whichApp.toLowerCase();
-
- if (this._currApp != 'media' && this._currApp != 'content' && this._currApp != 'member') {
- jQuery("#buttonCreate").attr("disabled", "true").fadeOut(400);
- jQuery("#FindDocuments .umbracoSearchHolder").fadeOut(400);
- }
- else {
- // create button should still remain disabled for the memebers section
- if (this._currApp == 'member') {
- jQuery("#buttonCreate").attr("disabled", "true").css("display", "inline-block").css("visibility", "hidden");
- }
- else {
- jQuery("#buttonCreate").removeAttr("disabled").fadeIn(500).css("visibility", "visible");
- }
- jQuery("#FindDocuments .umbracoSearchHolder").fadeIn(500);
- //need to set the recycle bin node id based on app
- switch (this._currApp) {
- case ("media"):
- UmbClientMgr.mainTree().setRecycleBinNodeId(-21);
- break;
- case ("content"):
- UmbClientMgr.mainTree().setRecycleBinNodeId(-20);
- break;
- }
- }
-
- UmbClientMgr.mainTree().rebuildTree(whichApp, function(args) {
- //the callback will fire when the tree rebuilding is done, we
- //need to check the args to see if the tree was rebuild from cache
- //and if it had a previously selected node, if it didn't then load the dashboard.
- if (!args) {
- UmbClientMgr.contentFrame('dashboard.aspx?app=' + whichApp);
- }
- });
-
- jQuery("#treeWindowLabel").html(appName);
-
- UmbClientMgr.mainWindow().document.title = appName + this._windowTitle + window.location.hostname.toLowerCase().replace('www', '');
- },
-
- getCurrApp: function() {
- return this._currApp;
- },
-
-
- //TODO: Move this into a window manager class
- openDialog: function(diaTitle, diaDoc, dwidth, dheight, optionalParams) {
- /// Opens the dialog window
-
- if (this._dialogWindow != null && !this._dialogWindow.closed) {
- this._dialogWindow.close();
- }
- this._dialogWindow = UmbClientMgr.mainWindow().open(diaDoc, 'dialogpage', "width=" + dwidth + "px,height=" + dheight + "px" + optionalParams);
- },
-
- openDashboard: function(whichApp) {
- UmbClientMgr.contentFrame('dashboard.aspx?app=' + whichApp);
- },
-
- actionTreeEditMode: function() {
- ///
- UmbClientMgr.mainTree().toggleEditMode(true);
- },
-
- actionSort: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '0' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/sort.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&app=' + this._currApp + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_sort'], true, 600, 450);
- }
-
- },
-
- actionChangeDocType: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '0' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/changeDocType.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&app=' + this._currApp + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_changeDocType'], true, 600, 600);
- }
-
- },
-
- actionProtect: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/protectPage.aspx?mode=cut&nodeId=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_protect'], true, 535, 480);
- }
- },
-
- actionRollback: function() {
- ///
-
- UmbClientMgr.openModalWindow('dialogs/rollback.aspx?nodeId=' + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_rollback'], true, 600, 550);
- },
-
- actionRefresh: function() {
- ///
-
- //raise nodeRefresh event
- jQuery(window.top).trigger("nodeRefresh", []);
- },
-
- actionNotify: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/notifications.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_notify'], true, 300, 480);
- }
- },
-
- actionUpdate: function() {
- ///
- },
-
- actionPublish: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '' != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/publish.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId, uiKeys['actions_publish'], true, 540, 280);
- }
- },
-
- actionToPublish: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- if (confirm(uiKeys['defaultdialogs_confirmSure'] + '\n\n')) {
- UmbClientMgr.openModalWindow('dialogs/SendPublish.aspx?id=' + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_sendtopublish'], true, 300, 200);
- }
- }
- },
-
- actionQuit: function(t) {
-
- if (!t) {
- throw "The security token must be set in order to log a user out using this method";
- }
-
- if (confirm(uiKeys['defaultdialogs_confirmlogout'] + '\n\n'))
- document.location.href = 'logout.aspx?t=' + t;
- },
-
- actionRePublish: function() {
- ///
-
- UmbClientMgr.openModalWindow('dialogs/republish.aspx?rnd=' + this._utils.generateRandom(), uiKeys['actions_republish'], true, 450, 210);
- },
-
- actionAssignDomain: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/assignDomain2.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId, uiKeys['actions_assignDomain'], true, 500, 620);
- }
- },
-
- actionNew: function() {
- /// Show the create new modal overlay
- var actionNode = UmbClientMgr.mainTree().getActionNode();
- if (actionNode.nodeType != '') {
- if (actionNode.nodeType == "content") {
- UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 600, 425);
- }
- else if (actionNode.nodeType == "initmember") {
- 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 == "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 {
- UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 270);
- }
- }
- },
-
- actionNewFolder: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- this.openDialog("Opret", "createFolder.aspx?nodeId=" + UmbClientMgr.mainTree().getActionNode().nodeId + "&nodeType=" + UmbClientMgr.mainTree().getActionNode().nodeType + "&nodeName=" + nodeName + '&rnd=' + this._utils.generateRandom(), 320, 225);
- }
- },
-
- actionSendToTranslate: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeId != '-1' && UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/sendToTranslation.aspx?id=" + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_sendToTranslate'], true, 500, 470);
- }
- },
-
-
- actionImport: function() {
- ///
-
- if (UmbClientMgr.mainTree().getActionNode().nodeType != '') {
- UmbClientMgr.openModalWindow("dialogs/importDocumentType.aspx?rnd=" + this._utils.generateRandom(), uiKeys['actions_importDocumentType'], true, 460, 400);
- }
- },
-
- actionPackage: function() {
- ///
- },
-
- actionDelete: function() {
- ///
-
- var actionNode = UmbClientMgr.mainTree().getActionNode();
- if (UmbClientMgr.mainTree().getActionNode().nodeType == "content" && UmbClientMgr.mainTree().getActionNode().nodeId == '-1')
- return;
-
- this._debug("actionDelete");
-
- // tg: quick workaround for the are you sure you want to delete 'null' confirm message happening when deleting xslt files
- currrentNodeName = UmbClientMgr.mainTree().getActionNode().nodeName;
- if (currrentNodeName == null || currrentNodeName == "null") {
- currrentNodeName = UmbClientMgr.mainTree().getActionNode().nodeId;
- }
-
- if (confirm(uiKeys['defaultdialogs_confirmdelete'] + ' "' + currrentNodeName + '"?\n\n')) {
- //raise nodeDeleting event
- jQuery(window.top).trigger("nodeDeleting", []);
- var _this = this;
-
- //check if it's in the recycle bin
- if (actionNode.jsNode.closest("li[id='-20']").length == 1 || actionNode.jsNode.closest("li[id='-21']").length == 1) {
- umbraco.presentation.webservices.legacyAjaxCalls.DeleteContentPermanently(
- UmbClientMgr.mainTree().getActionNode().nodeId,
- UmbClientMgr.mainTree().getActionNode().nodeType,
- function() {
- _this._debug("actionDelete: Raising event");
- //raise nodeDeleted event
- jQuery(window.top).trigger("nodeDeleted", []);
- });
- }
- else {
- umbraco.presentation.webservices.legacyAjaxCalls.Delete(
- UmbClientMgr.mainTree().getActionNode().nodeId,
- UmbClientMgr.mainTree().getActionNode().nodeName,
- UmbClientMgr.mainTree().getActionNode().nodeType,
- function() {
- _this._debug("actionDelete: Raising event");
- //raise nodeDeleted event
- jQuery(window.top).trigger("nodeDeleted", []);
- },
- function(error) {
- _this._debug("actionDelete: Raising public error event");
- //raise public error event
- jQuery(window.top).trigger("publicError", [error]);
- });
- }
- }
-
- },
-
- _debug: function(strMsg) {
- if (this._isDebug) {
- Sys.Debug.trace("AppActions: " + strMsg);
- }
- }
- };
-};
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js
deleted file mode 100644
index 1435f27cce..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js
+++ /dev/null
@@ -1,11 +0,0 @@
-///
-
-Umbraco.Sys.registerNamespace("Umbraco.Utils");
-
-Umbraco.Utils.generateRandom = function() {
- /// Returns a random integer for use with URLs
- var day = new Date();
- var z = day.getTime();
- var y = (z - (parseInt(z / 1000, 10) * 1000)) / 10;
- return y;
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs b/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
deleted file mode 100644
index 7ba6e14567..0000000000
--- a/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
- ///
- /// The core libs that have no dependencies
- ///
- [ClientDependency(ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient", Priority = 0, Group = 0)]
- [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoUtils.js", "UmbracoClient", Priority = 1, Group = 0)]
- public class JsApplicationLib : Control
- {
- }
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
deleted file mode 100644
index 712f6e6a1d..0000000000
--- a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
- ///
- /// The core libs that require JQuery to be loaded
- ///
- [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoApplicationActions.js", "UmbracoClient", Priority = 1, Group = 2)]
- public class JsUmbracoApplicationCore : Control
- {
- }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b1d950cc1f..e981d5aa25 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -959,9 +959,7 @@
-
-
diff --git a/src/Umbraco.Web/_Legacy/Controls/BaseTreePicker.cs b/src/Umbraco.Web/_Legacy/Controls/BaseTreePicker.cs
index 7de4b9d4e0..d0ff91dc8c 100644
--- a/src/Umbraco.Web/_Legacy/Controls/BaseTreePicker.cs
+++ b/src/Umbraco.Web/_Legacy/Controls/BaseTreePicker.cs
@@ -1,24 +1,12 @@
using System;
-using System.Web.UI;
-using ClientDependency.Core;
-using ClientDependency.Core.Controls;
+using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
-using umbraco.cms.businesslogic;
-using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Services;
namespace Umbraco.Web._Legacy.Controls
{
-
- /*
- [ClientDependency(0, ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient")]
- [ClientDependency(ClientDependencyType.Css, "modal/style.css", "UmbracoClient")]
- [ClientDependency(ClientDependencyType.Javascript, "modal/modal.js", "UmbracoClient")]
- [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoClientManager.js", "UmbracoClient")]
- [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoUtils.js", "UmbracoClient")]*/
-
[ValidationProperty("Value")]
public abstract class BaseTreePicker : Control, INamingContainer
{
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
index 783044ac75..12b056fedd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
@@ -17,9 +17,6 @@ namespace umbraco.controls.Tree
/// Since we're inheriting from a UserControl and all of the ClientDependency registrations are done inline, we need
/// to re-register the ClientDependencies.
///
- [ClientDependency(0, ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient")]
- [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoApplicationActions.js", "UmbracoClient")]
- [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoUtils.js", "UmbracoClient")]
[ClientDependency(11, ClientDependencyType.Javascript, "Tree/jquery.tree.js", "UmbracoClient")]
[ClientDependency(12, ClientDependencyType.Javascript, "Tree/UmbracoContext.js", "UmbracoClient")]
[ClientDependency(12, ClientDependencyType.Javascript, "Tree/jquery.tree.contextmenu.js", "UmbracoClient")]