From 9d7b3b965a77ceb97d45148f56118074bc77b31b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 12 Feb 2014 18:19:20 +1100
Subject: [PATCH] fixes some issues with new bundles.

---
 .../umbraco/plugins/tinymce3/insertImage.aspx     |  6 +++++-
 .../umbraco/plugins/tinymce3/insertLink.aspx      |  9 +++++++--
 .../umbraco/plugins/tinymce3/insertMacro.aspx     |  8 ++++++--
 .../umbraco/plugins/tinymce3/insertImage.aspx     |  6 +++++-
 .../plugins/tinymce3/insertImage.aspx.designer.cs | 15 +++------------
 .../umbraco/plugins/tinymce3/insertLink.aspx      |  6 +++++-
 .../plugins/tinymce3/insertLink.aspx.designer.cs  | 13 ++-----------
 .../umbraco/plugins/tinymce3/insertMacro.aspx     |  8 ++++++--
 .../plugins/tinymce3/insertMacro.aspx.designer.cs |  9 ---------
 9 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertImage.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertImage.aspx
index 7d386232d1..6388b243ee 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertImage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertImage.aspx
@@ -4,6 +4,7 @@
 <%@ Register TagPrefix="umb2" TagName="Tree" Src="../../controls/Tree/TreeControl.ascx" %>
 <%@ Register TagPrefix="umb3" TagName="Image" Src="../../controls/Images/ImageViewer.ascx" %>
 <%@ Register TagName="MediaUpload" TagPrefix="umb4" Src="../../controls/Images/UploadMediaImage.ascx" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +15,10 @@
 
     <ui:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
 	
-	<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
+	<umbClient:JsApplicationLib runat="server" />
+    <umbClient:JsJQueryCore runat="server" />
+    <umbClient:JsUmbracoApplicationCore runat="server" />
+
 	<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Application/jQuery/jquery.noconflict-invoke.js" PathNameAlias="UmbracoClient" Priority="1" />
 	<umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="4" />
 	<umb:JsInclude ID="JsInclude4" runat="server" FilePath="tinymce3/tiny_mce_popup.js" PathNameAlias="UmbracoClient" Priority="100" />
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
index 24de8c77b9..a55780b7c3 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
@@ -2,6 +2,7 @@
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
 
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -14,14 +15,18 @@
 
     <ui:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
 	
-	<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
+	
+    <umbClient:JsApplicationLib runat="server" />
+    <umbClient:JsJQueryCore runat="server" />
+    <umbClient:JsUmbracoApplicationCore runat="server" />
+
 	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="tinymce3/tiny_mce_popup.js" PathNameAlias="UmbracoClient" Priority="100" />
 	<umb:JsInclude ID="JsInclude3" runat="server" FilePath="tinymce3/plugins/umbracolink/js/umbracolink.js" PathNameAlias="UmbracoClient" Priority="101" />
 	<umb:JsInclude ID="JsInclude4" runat="server" FilePath="tinymce3/utils/form_utils.js" PathNameAlias="UmbracoClient" Priority="102" />
     <umb:JsInclude ID="JsInclude5" runat="server" FilePath="tinymce3/utils/validate.js" PathNameAlias="UmbracoClient" Priority="103" />
    
 
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
         var currentLink = "";
 
         function dialogHandler(id) {
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
index b6017824f4..042aa7ce1d 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
@@ -5,6 +5,7 @@
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="asp" Namespace="System.Web.UI" Assembly="System.Web" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -12,8 +13,11 @@
     <base target="_self" />
 
     <ui:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
-    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
-        Priority="0" />
+    
+    <umbClient:JsApplicationLib runat="server" />
+    <umbClient:JsJQueryCore runat="server" />
+    <umbClient:JsUmbracoApplicationCore runat="server" />
+
     <umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient"
         Priority="4" />
     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="tinymce3/tiny_mce_popup.js"
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx
index 7d386232d1..1ae2936713 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx
@@ -4,6 +4,7 @@
 <%@ Register TagPrefix="umb2" TagName="Tree" Src="../../controls/Tree/TreeControl.ascx" %>
 <%@ Register TagPrefix="umb3" TagName="Image" Src="../../controls/Images/ImageViewer.ascx" %>
 <%@ Register TagName="MediaUpload" TagPrefix="umb4" Src="../../controls/Images/UploadMediaImage.ascx" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +15,10 @@
 
     <ui:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
 	
-	<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
+	<umbClient:JsApplicationLib runat="server" />
+    <umbClient:JsJQueryCore runat="server" />
+    <umbClient:JsUmbracoApplicationCore runat="server" />
+
 	<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Application/jQuery/jquery.noconflict-invoke.js" PathNameAlias="UmbracoClient" Priority="1" />
 	<umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="4" />
 	<umb:JsInclude ID="JsInclude4" runat="server" FilePath="tinymce3/tiny_mce_popup.js" PathNameAlias="UmbracoClient" Priority="100" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs
index 467d6fa5e3..4acd276c9d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs
@@ -21,15 +21,6 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// </remarks>
         protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
         
-        /// <summary>
-        /// JsInclude3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-        
         /// <summary>
         /// JsInclude9 control.
         /// </summary>
@@ -118,7 +109,7 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.ScriptManager ScriptManager1;
+        protected global::System.Web.UI.WebControls.ScriptManager ScriptManager1;
         
         /// <summary>
         /// pane_src control.
@@ -136,7 +127,7 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::umbraco.controls.Images.ImageViewer ImageViewer;
+        protected global::System.Web.UI.UserControl ImageViewer;
         
         /// <summary>
         /// pp_src control.
@@ -208,7 +199,7 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl DialogTree;
+        protected global::System.Web.UI.UserControl DialogTree;
         
         /// <summary>
         /// pane_upload control.
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx
index 24de8c77b9..8f0a32ca16 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx
@@ -2,6 +2,7 @@
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" %>
 
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -14,7 +15,10 @@
 
     <ui:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
 	
-	<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
+	<umbClient:JsApplicationLib runat="server" />
+    <umbClient:JsJQueryCore runat="server" />
+    <umbClient:JsUmbracoApplicationCore runat="server" />
+
 	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="tinymce3/tiny_mce_popup.js" PathNameAlias="UmbracoClient" Priority="100" />
 	<umb:JsInclude ID="JsInclude3" runat="server" FilePath="tinymce3/plugins/umbracolink/js/umbracolink.js" PathNameAlias="UmbracoClient" Priority="101" />
 	<umb:JsInclude ID="JsInclude4" runat="server" FilePath="tinymce3/utils/form_utils.js" PathNameAlias="UmbracoClient" Priority="102" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs
index c3fc0b59ef..6377250720 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs
@@ -30,15 +30,6 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// </remarks>
         protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
         
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-        
         /// <summary>
         /// JsInclude1 control.
         /// </summary>
@@ -136,7 +127,7 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl TreeControl2;
+        protected global::System.Web.UI.UserControl TreeControl2;
         
         /// <summary>
         /// pane_media control.
@@ -154,6 +145,6 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl TreeControl1;
+        protected global::System.Web.UI.UserControl TreeControl1;
     }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx
index ca3e9f2bcd..49f12277e2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx
@@ -4,6 +4,7 @@
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="asp" Namespace="System.Web.UI" Assembly="System.Web" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -11,8 +12,11 @@
     <base target="_self" />
 
     <ui:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
-    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
-        Priority="0" />
+    
+    <umbClient:JsApplicationLib runat="server" />
+    <umbClient:JsJQueryCore runat="server" />
+    <umbClient:JsUmbracoApplicationCore runat="server" />
+
     <umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient"
         Priority="4" />
     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="tinymce3/tiny_mce_popup.js"
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs
index acbc01c833..fa9f711345 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs
@@ -21,15 +21,6 @@ namespace umbraco.presentation.tinymce3 {
         /// </remarks>
         protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
         
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-        
         /// <summary>
         /// JsInclude8 control.
         /// </summary>
