Send newsletter to test...
"); mailerLogic.SendTestmail(umbraco.helper.Request(this.ClientID + "_test_rcp"), new cms.businesslogic.property.Property(_data.PropertyId), config[9], config[10], true); writer.WriteLine("Test mail sent to: " + umbraco.helper.Request(this.ClientID + "_test_rcp") + "
"); - } - else + } + else { writer.WriteLine("
Send newsletter to all...
"); mailerLogic.SendMail(mg, new cms.businesslogic.property.Property(_data.PropertyId), config[9], config[10], true); writer.WriteLine("Sent...
"); - } - } - else + } + } + else { - if (umbraco.helper.Request(this.ClientID + "_doTest") != "") + if (umbraco.helper.Request(this.ClientID + "_doTest") != "") { writer.WriteLine("
Send newsletter to test...
"); writer.WriteLine("Send test to: "); writer.WriteLine(""); } - else + else { string strScript = " alert('The MassMailer / UltraSimplerMailer is incompatible with Umbraco 4'); umbPgStep = 1;\n umbPgIgnoreSteps = true;\n"; if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) ScriptManager.RegisterClientScriptBlock(this, this.GetType(), this.ClientID, strScript, true); else Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID, strScript, true); - - writer.WriteLine("
![\"Sending](\"images/anims/publishPages.gif\"")
\n" + - " Sending mails...\n" + - "
\n" + + + writer.WriteLine("
\n" + + " Sending mails...\n" + + "
\n" + "
\n"); @@ -104,7 +109,7 @@ namespace umbraco.editorControls.ultraSimpleMailer pb.ID = "ultraSimpleMailerUpgradeStatus"; pb.Width = 200; pb.RenderControl(writer); - writer.WriteLine("
");
writer.WriteLine("
"); writer.WriteLine("Please confirm that you want to send this message to " + mailerLogic.GetTotalReceiptients(mg).ToString() + " recipients
"); @@ -120,26 +125,26 @@ namespace umbraco.editorControls.ultraSimpleMailer } - + public object[] MenuIcons { get { - object[] _buttons = { }; + object[] _buttons = { }; ArrayList buttons = new ArrayList(); - for (int i=0;i<_buttons.Length;i++) + for (int i = 0; i < _buttons.Length; i++) buttons.Add(_buttons[i]); // Add the two new buttons - MenuIconI menuItemSend = new MenuIconClass(); + MenuIconI menuItemSend = new MenuIconClass(); menuItemSend.OnClickCommand = "ultraSimpleMailer_doSend('" + this.ClientID + "')"; menuItemSend.ImageURL = "/umbraco_client/ultraSimpleMailer/images/newsletterSend.gif"; menuItemSend.AltText = "Send newsletter to all"; menuItemSend.ID = "sendToAll"; buttons.Insert(0, menuItemSend); - - MenuIconI menuItemTest = new MenuIconClass(); + + MenuIconI menuItemTest = new MenuIconClass(); menuItemTest.OnClickCommand = "ultraSimpleMailer_doSendTest('" + this.ClientID + "')"; menuItemTest.ImageURL = "/umbraco_client/ultraSimpleMailer/images/newsletterSendTest.gif"; menuItemTest.AltText = "Test newsletter by sending to a mail address you specify"; @@ -148,8 +153,8 @@ namespace umbraco.editorControls.ultraSimpleMailer buttons.Insert(2, "|"); // Re-create the button array - _buttons = new object[buttons.Count]; - for (int i=0;i
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/config templates/web.config b/config templates/web.config
index e09c4095d9..b286b3470b 100644
--- a/config templates/web.config
+++ b/config templates/web.config
@@ -32,6 +32,7 @@
+ /// Shows the dashboard for the given application
+ ///
+ ///
+ ///
/// Reloads the children of the current action node and selects the node that didn't exist there before.
@@ -159,7 +171,19 @@ namespace umbraco.BasePages
{
RegisterClientScript(string.Format(Scripts.SyncTree, path, forceReload.ToString().ToLower()));
return this;
- }
+ }
+
+ public ClientTools CopyNode(string currNodeId, string newParentPath)
+ {
+ RegisterClientScript(string.Format(Scripts.CopyNode, currNodeId, newParentPath));
+ return this;
+ }
+
+ public ClientTools MoveNode(string currNodeId, string newParentPath)
+ {
+ RegisterClientScript(string.Format(Scripts.MoveNode, currNodeId, newParentPath));
+ return this;
+ }
///
/// Reloads only the active node in the tree.
diff --git a/umbraco/cms/businesslogic/datatype/ClientDependencyAttribute.cs b/umbraco/cms/businesslogic/datatype/ClientDependencyAttribute.cs
index d9973b08ce..3436b45388 100644
--- a/umbraco/cms/businesslogic/datatype/ClientDependencyAttribute.cs
+++ b/umbraco/cms/businesslogic/datatype/ClientDependencyAttribute.cs
@@ -4,95 +4,95 @@ using System.Text;
namespace umbraco.cms.businesslogic.datatype
{
- ///
- /// This attribute is used for data types that uses client assets like Javascript and CSS for liveediting.
- /// The Live Editing feature in umbraco will look for this attribute and preload all dependencies to the page
- /// to ensure that all client events and assets gets loaded
- ///
- [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
- public class ClientDependencyAttribute : Attribute
- {
- ///
- /// Gets or sets the priority.
- ///
- /// The priority.
- public int Priority { get; set; }
+ /////
+ ///// This attribute is used for data types that uses client assets like Javascript and CSS for liveediting.
+ ///// The Live Editing feature in umbraco will look for this attribute and preload all dependencies to the page
+ ///// to ensure that all client events and assets gets loaded
+ /////
+ //[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+ //public class ClientDependencyAttribute : Attribute
+ //{
+ // ///
+ // /// Gets or sets the priority.
+ // ///
+ // /// The priority.
+ // public int Priority { get; set; }
- ///
- /// Gets or sets the file path.
- ///
- /// The file path.
- public string FilePath { get; set; }
+ // ///
+ // /// Gets or sets the file path.
+ // ///
+ // /// The file path.
+ // public string FilePath { get; set; }
- ///
- /// Gets or sets the type of the dependency.
- ///
- /// The type of the dependency.
- public ClientDependencyType DependencyType { get; set; }
+ // ///
+ // /// Gets or sets the type of the dependency.
+ // ///
+ // /// The type of the dependency.
+ // public ClientDependencyType DependencyType { get; set; }
- ///
- /// Gets or sets the name of an optional javascript method that should be called on load.
- ///
- /// The name of the method.
- public string InvokeJavascriptMethodOnLoad { get; set; }
+ // ///
+ // /// Gets or sets the name of an optional javascript method that should be called on load.
+ // ///
+ // /// The name of the method.
+ // public string InvokeJavascriptMethodOnLoad { get; set; }
- ///
- /// Initializes a new instance of the
- /// The priority.
- /// Type of the dependency.
- /// The file path to the dependency.
- public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath)
- : this(priority, dependencyType, filePath, false, string.Empty)
- { }
+ // ///
+ // /// Initializes a new instance of the
+ // /// The priority.
+ // /// Type of the dependency.
+ // /// The file path to the dependency.
+ // public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath)
+ // : this(priority, dependencyType, filePath, false, string.Empty)
+ // { }
- ///
- /// Initializes a new instance of the
- /// The priority.
- /// Type of the dependency.
- /// The file path to the dependency.
- /// The name of the Javascript method to invoke when the dependency is loaded.
- public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, string invokeJavascriptMethodOnLoad)
- : this(priority, dependencyType, filePath, false, invokeJavascriptMethodOnLoad)
- { }
+ // ///
+ // /// Initializes a new instance of the
+ // /// The priority.
+ // /// Type of the dependency.
+ // /// The file path to the dependency.
+ // /// The name of the Javascript method to invoke when the dependency is loaded.
+ // public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, string invokeJavascriptMethodOnLoad)
+ // : this(priority, dependencyType, filePath, false, invokeJavascriptMethodOnLoad)
+ // { }
- ///
- /// Initializes a new instance of the
- /// The priority.
- /// Type of the dependency.
- /// The file path to the dependency.
- /// if set to true the current umbraco path will be prefixed to the filePath.
- public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, bool appendUmbracoPath)
- : this(priority, dependencyType, filePath, appendUmbracoPath, String.Empty)
- { }
+ // ///
+ // /// Initializes a new instance of the
+ // /// The priority.
+ // /// Type of the dependency.
+ // /// The file path to the dependency.
+ // /// if set to true the current umbraco path will be prefixed to the filePath.
+ // public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, bool appendUmbracoPath)
+ // : this(priority, dependencyType, filePath, appendUmbracoPath, String.Empty)
+ // { }
- ///
- /// Initializes a new instance of the
- /// The priority.
- /// Type of the dependency.
- /// The file path to the dependency.
- /// if set to true the current umbraco path will be prefixed to the filePath.
- /// The name of the Javascript method to invoke when the dependency is loaded.
- public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, bool appendUmbracoPath, string invokeJavascriptMethodOnLoad)
- {
- if (String.IsNullOrEmpty(filePath))
- throw new ArgumentException("filePath");
+ // ///
+ // /// Initializes a new instance of the
+ // /// The priority.
+ // /// Type of the dependency.
+ // /// The file path to the dependency.
+ // /// if set to true the current umbraco path will be prefixed to the filePath.
+ // /// The name of the Javascript method to invoke when the dependency is loaded.
+ // public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, bool appendUmbracoPath, string invokeJavascriptMethodOnLoad)
+ // {
+ // if (String.IsNullOrEmpty(filePath))
+ // throw new ArgumentException("filePath");
- Priority = priority;
- FilePath = appendUmbracoPath ? GlobalSettings.Path + "/" + filePath : filePath;
- DependencyType = dependencyType;
- InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad ?? String.Empty;
- }
- }
+ // Priority = priority;
+ // FilePath = appendUmbracoPath ? GlobalSettings.Path + "/" + filePath : filePath;
+ // DependencyType = dependencyType;
+ // InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad ?? String.Empty;
+ // }
+ //}
- ///
- /// The type of client file
- ///
- public enum ClientDependencyType
- {
- Javascript, Css
- }
+ /////
+ ///// The type of client file
+ /////
+ //public enum ClientDependencyType
+ //{
+ // Javascript, Css
+ //}
}
diff --git a/umbraco/cms/businesslogic/datatype/ClientDependencyHelper.cs b/umbraco/cms/businesslogic/datatype/ClientDependencyHelper.cs
index 053bdd801b..9d0a94ebec 100644
--- a/umbraco/cms/businesslogic/datatype/ClientDependencyHelper.cs
+++ b/umbraco/cms/businesslogic/datatype/ClientDependencyHelper.cs
@@ -6,66 +6,66 @@ using System.Web;
namespace umbraco.cms.businesslogic.datatype
{
- public class ClientDependencyHelper
- {
- /// Path to the dependency loader we need for adding control dependencies.
- protected const string DependencyLoaderScriptFile = "{0}/js/UmbracoDependencyLoader.js";
+ //public class ClientDependencyHelper
+ //{
+ // /// Path to the dependency loader we need for adding control dependencies.
+ // protected const string DependencyLoaderScriptFile = "{0}/js/UmbracoDependencyLoader.js";
- ///
- /// Adds the client dependencies to the passed page's client script manager.
- ///
- public static void AddClientDependencies(Control control) {
- Type controlType = control.GetType();
+ // ///
+ // /// Adds the client dependencies to the passed page's client script manager.
+ // ///
+ // public static void AddClientDependencies(Control control) {
+ // Type controlType = control.GetType();
- // find dependencies
- List dependencies = new List();
- foreach (Attribute attribute in Attribute.GetCustomAttributes(controlType))
- {
- if (attribute is ClientDependencyAttribute)
- {
- dependencies.Add((ClientDependencyAttribute)attribute);
- }
- }
- // sort by priority
- dependencies.Sort((a, b) => a.Priority.CompareTo(b.Priority));
+ // // find dependencies
+ // List dependencies = new List();
+ // foreach (Attribute attribute in Attribute.GetCustomAttributes(controlType))
+ // {
+ // if (attribute is ClientDependencyAttribute)
+ // {
+ // dependencies.Add((ClientDependencyAttribute)attribute);
+ // }
+ // }
+ // // sort by priority
+ // dependencies.Sort((a, b) => a.Priority.CompareTo(b.Priority));
- if (dependencies.Count > 0)
- {
- // register loader script
- if (!HttpContext.Current.Items.Contains(DependencyLoaderScriptFile))
- {
- ScriptManager.RegisterClientScriptInclude(control, controlType, "DependencyLoader",
- String.Format(DependencyLoaderScriptFile, GlobalSettings.Path));
- HttpContext.Current.Items[DependencyLoaderScriptFile] = true;
- }
+ // if (dependencies.Count > 0)
+ // {
+ // // register loader script
+ // if (!HttpContext.Current.Items.Contains(DependencyLoaderScriptFile))
+ // {
+ // ScriptManager.RegisterClientScriptInclude(control, controlType, "DependencyLoader",
+ // String.Format(DependencyLoaderScriptFile, GlobalSettings.Path));
+ // HttpContext.Current.Items[DependencyLoaderScriptFile] = true;
+ // }
- // create Javascript calls
- StringBuilder dependencyCalls = new StringBuilder("UmbDependencyLoader");
- foreach (ClientDependencyAttribute dependency in dependencies)
- {
- switch (dependency.DependencyType)
- {
- case ClientDependencyType.Css:
- dependencyCalls.AppendFormat(".AddCss('{0}')", dependency.FilePath);
- break;
- case ClientDependencyType.Javascript:
- dependencyCalls.AppendFormat(".AddJs('{0}','{1}')",
- dependency.FilePath, dependency.InvokeJavascriptMethodOnLoad);
- break;
- }
- }
- dependencyCalls.Append(';');
+ // // create Javascript calls
+ // StringBuilder dependencyCalls = new StringBuilder("UmbDependencyLoader");
+ // foreach (ClientDependencyAttribute dependency in dependencies)
+ // {
+ // switch (dependency.DependencyType)
+ // {
+ // case ClientDependencyType.Css:
+ // dependencyCalls.AppendFormat(".AddCss('{0}')", dependency.FilePath);
+ // break;
+ // case ClientDependencyType.Javascript:
+ // dependencyCalls.AppendFormat(".AddJs('{0}','{1}')",
+ // dependency.FilePath, dependency.InvokeJavascriptMethodOnLoad);
+ // break;
+ // }
+ // }
+ // dependencyCalls.Append(';');
- // register Javascript calls
- ScriptManager.RegisterClientScriptBlock(control, controlType, new Guid().ToString(),
- dependencyCalls.ToString(), true);
- }
+ // // register Javascript calls
+ // ScriptManager.RegisterClientScriptBlock(control, controlType, new Guid().ToString(),
+ // dependencyCalls.ToString(), true);
+ // }
- // add child dependencies
- foreach (Control child in control.Controls)
- {
- AddClientDependencies(child);
- }
- }
- }
+ // // add child dependencies
+ // foreach (Control child in control.Controls)
+ // {
+ // AddClientDependencies(child);
+ // }
+ // }
+ //}
}
diff --git a/umbraco/presentation.ClientDependency/BasicClientDependencyFile.cs b/umbraco/presentation.ClientDependency/BasicClientDependencyFile.cs
new file mode 100644
index 0000000000..c20f87f597
--- /dev/null
+++ b/umbraco/presentation.ClientDependency/BasicClientDependencyFile.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace umbraco.presentation.ClientDependency
+{
+ public class BasicClientDependencyFile : IClientDependencyFile
+ {
+ public BasicClientDependencyFile(ClientDependencyType type)
+ {
+ DependencyType = type;
+ }
+
+ #region IClientDependencyFile Members
+
+ public string FilePath { get; set; }
+ public ClientDependencyType DependencyType { get; private set; }
+ public string InvokeJavascriptMethodOnLoad { get; set; }
+ public int Priority { get; set; }
+ public string PathNameAlias { get; set; }
+ public bool DoNotOptimize { get; set; }
+
+ #endregion
+ }
+}
diff --git a/umbraco/presentation.ClientDependency/BasicClientDependencyPath.cs b/umbraco/presentation.ClientDependency/BasicClientDependencyPath.cs
new file mode 100644
index 0000000000..b52ef331ed
--- /dev/null
+++ b/umbraco/presentation.ClientDependency/BasicClientDependencyPath.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+
+namespace umbraco.presentation.ClientDependency
+{
+ public class BasicClientDependencyPath : IClientDependencyPath
+ {
+ public string Name { get; set; }
+ public string Path { get; set; }
+ public string ResolvedPath
+ {
+ get
+ {
+ return (HttpContext.Current.CurrentHandler as Page).ResolveUrl(Path);
+ }
+ }
+ }
+}
diff --git a/umbraco/presentation.ClientDependency/ClientDependencyCollection.cs b/umbraco/presentation.ClientDependency/ClientDependencyCollection.cs
new file mode 100644
index 0000000000..c4b1187483
--- /dev/null
+++ b/umbraco/presentation.ClientDependency/ClientDependencyCollection.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace umbraco.presentation.ClientDependency
+{
+
+ ///
+ /// Wraps a HashSet object for the client dependency file type and declares a equality operator
+ ///
+ public class ClientDependencyCollection : HashSet
+ {
+
+ public ClientDependencyCollection() : base(new ClientDependencyComparer()) { }
+
+ internal class ClientDependencyComparer : IEqualityComparer
+ {
+ #region IEqualityComparer Members
+
+ ///
+ /// If the lowercased combination of the file path, dependency type and path name aliases are the same,
+ /// then they are the same dependency.
+ ///
+ ///
+ ///
+ ///
+ /// Singleton per request instance.
+ ///
+ ///
+ /// If no ClientDependencyLoader control exists on the current page, an exception is thrown.
+ ///
+ public static ClientDependencyLoader Instance
{
- RegisterDependency(filePath, "", type);
- }
-
- public static void RegisterDependency(string filePath, string pathNameAlias, ClientDependencyType type)
- {
- RegisterDependency(ClientDependencyInclude.DefaultPriority, false, filePath, pathNameAlias, type, "");
+ get
+ {
+ if (!HttpContext.Current.Items.Contains(ContextKey))
+ return null;
+ return HttpContext.Current.Items[ContextKey] as ClientDependencyLoader;
+ }
}
///
- /// Dynamically registers a dependency into the loader at runtime.
- /// This is similar to ScriptManager.RegisterClientScriptInclude
+ /// Tracks all dependencies and maintains a deduplicated list
///
- ///
- public static void RegisterDependency(int priority, bool doNotOptimize, string filePath, string pathNameAlias, ClientDependencyType type, string invokeJavascriptMethodOnLoad)
- {
- if (!HttpContext.Current.Items.Contains(ContextKey))
- throw new NullReferenceException("No ClientDependencyLoader found in the current request");
-
- ClientDependencyLoader loader = HttpContext.Current.Items[ContextKey] as ClientDependencyLoader;
- if (loader == null)
- throw new Exception("Could not find a ClientDependencyLoader in the current request");
-
- //loader.RegisteredFiles.Add(file);
- //create/add a new control to this control's collection
- if (type == ClientDependencyType.Css)
- {
- CssInclude cssInc = new CssInclude();
- cssInc.DoNotOptimize = doNotOptimize;
- cssInc.Priority = priority;
- cssInc.FilePath = filePath;
- cssInc.PathNameAlias = pathNameAlias;
- cssInc.InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad;
- loader.Controls.Add(cssInc);
- }
- else
- {
- JsInclude jsInc = new JsInclude();
- jsInc.DoNotOptimize = doNotOptimize;
- jsInc.Priority = priority;
- jsInc.FilePath = filePath;
- jsInc.PathNameAlias = pathNameAlias;
- jsInc.InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad;
- loader.Controls.Add(jsInc);
- }
- }
-
- protected override void OnInit(EventArgs e)
- {
- base.OnInit(e);
- if (HttpContext.Current.Items.Contains(ContextKey))
- {
- throw new Exception("Only one ClientDependencyLoader may exist on a page");
- }
- else
- {
- HttpContext.Current.Items.Add(ContextKey, this);
- }
- }
+ private List m_Dependencies = new List();
+ ///
+ /// Tracks all paths and maintains a deduplicated list
+ ///
+ private HashSet m_Paths = new HashSet();
///
/// Need to set the container for each of the paths to support databinding.
@@ -112,27 +91,33 @@ namespace umbraco.presentation.ClientDependency.Controls
protected override void OnPreRender(EventArgs e)
{
base.OnPreRender(e);
- foreach (ClientDependencyPath path in Paths)
- {
- Page.Trace.Write("ClientDependency", string.Format("Path loaded: {0}", path.Path));
- }
- ClientDependencyProvider provider = null;
+
+ m_Paths.UnionWith(Paths.Cast());
+ ClientDependencyProvider provider = null;
switch (EmbedType)
{
case ClientDependencyEmbedType.Header:
provider = ClientDependencySettings.Instance.ProviderCollection[PageHeaderProvider.DefaultName];
- provider.IsDebugMode = IsDebugMode;
- ClientDependencyHelper.RegisterClientDependencies(provider, this.Page, Paths);
+ provider.IsDebugMode = IsDebugMode;
+ RegisterClientDependencies(provider, this.Page, m_Paths);
break;
case ClientDependencyEmbedType.ClientSideRegistration:
provider = ClientDependencySettings.Instance.ProviderCollection[ClientSideRegistrationProvider.DefaultName];
- provider.IsDebugMode = IsDebugMode;
- ClientDependencyHelper.RegisterClientDependencies(provider, this.Page, Paths);
+ provider.IsDebugMode = IsDebugMode;
+ RegisterClientDependencies(provider, this.Page, m_Paths);
break;
}
-
+
+ RenderDependencies();
+ }
+
+ private void RenderDependencies()
+ {
+ m_Dependencies.ForEach(x =>
+ {
+ x.Provider.RegisterDependencies(this.Page, x.Dependencies, m_Paths);
+ });
}
-
[PersistenceMode(PersistenceMode.InnerProperty)]
public ClientDependencyPathCollection Paths { get; private set; }
@@ -140,7 +125,212 @@ namespace umbraco.presentation.ClientDependency.Controls
public bool IsDebugMode { get; set; }
- private List m_Dependencies = new List();
+
+ #region Static Helper methods
+
+ ///
+ /// Checks if a loader already exists, if it does, it returns it, otherwise it will
+ /// create a new one in the control specified.
+ /// isNew will be true if a loader was created, otherwise false if it already existed.
+ ///
+ ///
+ ///
+ ///
+ /// Registers a file dependency with the default provider.
+ ///
+ ///
+ ///
+ public ClientDependencyLoader RegisterDependency(string filePath, ClientDependencyType type)
+ {
+ RegisterDependency(filePath, "", type);
+ return this;
+ }
+ ///
+ /// Registers a file dependency with the default provider.
+ ///
+ ///
+ ///
+ ///
+ public ClientDependencyLoader RegisterDependency(string filePath, string pathNameAlias, ClientDependencyType type)
+ {
+ ClientDependencyLoader.Instance.RegisterDependency(ClientDependencyInclude.DefaultPriority, false, filePath, pathNameAlias, type, "");
+ return this;
+ }
+
+ ///
+ /// Adds a path to the current loader
+ ///
+ ///
+ ///
+ public ClientDependencyLoader AddPath(string pathNameAlias, string path)
+ {
+ AddPath(new BasicClientDependencyPath() { Name = pathNameAlias, Path = path });
+ return this;
+ }
+
+ ///
+ /// Adds a path to the current loader
+ ///
+ ///
+ ///
+ public void AddPath(IClientDependencyPath path)
+ {
+ m_Paths.Add(path);
+ }
+
+ ///
+ /// Dynamically registers a dependency into the loader at runtime.
+ /// This is similar to ScriptManager.RegisterClientScriptInclude.
+ /// Registers a file dependency with the default provider.
+ ///
+ ///
+ public void RegisterDependency(int priority, bool doNotOptimize, string filePath, string pathNameAlias, ClientDependencyType type, string invokeJavascriptMethodOnLoad)
+ {
+ BasicClientDependencyFile file = new BasicClientDependencyFile(type);
+ file.DoNotOptimize = doNotOptimize;
+ file.Priority = priority;
+ file.FilePath = filePath;
+ file.PathNameAlias = pathNameAlias;
+ file.InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad;
+ RegisterClientDependencies(new ClientDependencyCollection() { file }, new List()); //send an empty paths collection
+ }
+
+ ///
+ /// Registers dependencies with the specified provider.
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// This is the top most overloaded method
+ ///
+ public void RegisterClientDependencies(ClientDependencyProvider provider, ClientDependencyCollection dependencies, IEnumerable paths)
+ {
+ //find or create the ProviderDependencyList for the provider passed in
+ ProviderDependencyList currList = m_Dependencies
+ .Where(x => x.Contains(provider))
+ .DefaultIfEmpty(new ProviderDependencyList(provider))
+ .SingleOrDefault();
+ //add the dependencies
+ currList.AddDependencies(dependencies);
+ //add the list if it is new
+ if (!m_Dependencies.Contains(currList))
+ m_Dependencies.Add(currList);
+ //add the paths, ensure no dups
+ m_Paths.UnionWith(paths);
+ }
+
+ public void RegisterClientDependencies(ClientDependencyCollection dependencies, IEnumerable paths)
+ {
+ RegisterClientDependencies(ClientDependencySettings.Instance.DefaultProvider, dependencies, paths);
+ }
+
+ ///
+ /// Registers dependencies with the default provider
+ ///
+ ///
+ ///
+ public void RegisterClientDependencies(Control control, ClientDependencyPathCollection paths)
+ {
+ RegisterClientDependencies(ClientDependencySettings.Instance.DefaultProvider, control, paths.Cast());
+ }
+
+ ///
+ /// Registers dependencies with the provider name specified
+ ///
+ ///
+ ///
+ ///
+ public void RegisterClientDependencies(string providerName, Control control, IEnumerable paths)
+ {
+ RegisterClientDependencies(ClientDependencySettings.Instance.ProviderCollection[providerName], control, paths);
+ }
+
+ ///
+ /// Registers dependencies with the provider specified by T
+ ///
+ public void RegisterClientDependencies(Control control, List paths)
+ where T : ClientDependencyProvider
+ {
+ //need to find the provider with the type
+ ClientDependencyProvider found = null;
+ foreach (ClientDependencyProvider p in ClientDependencySettings.Instance.ProviderCollection)
+ {
+ if (p.GetType().Equals(typeof(T)))
+ {
+ found = p;
+ break;
+ }
+ }
+ if (found == null)
+ throw new ArgumentException("Could not find the ClientDependencyProvider specified by T");
+
+ RegisterClientDependencies(found, control, paths);
+ }
+
+ public void RegisterClientDependencies(ClientDependencyProvider provider, Control control, IEnumerable paths)
+ {
+ ClientDependencyCollection dependencies = FindDependencies(control);
+ RegisterClientDependencies(provider, dependencies, paths);
+ }
+
+ ///
+ /// Recursively find all dependencies of this control and it's entire child control heirarchy.
+ ///
+ ///
+ ///
[ParseChildren(true)]
- public class ClientDependencyPath
+ public class ClientDependencyPath : IClientDependencyPath
{
string _name = "";
string _path = "";
diff --git a/umbraco/presentation.ClientDependency/IClientDependencyPath.cs b/umbraco/presentation.ClientDependency/IClientDependencyPath.cs
new file mode 100644
index 0000000000..e6e40ca945
--- /dev/null
+++ b/umbraco/presentation.ClientDependency/IClientDependencyPath.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace umbraco.presentation.ClientDependency
+{
+ public interface IClientDependencyPath
+ {
+
+ string Name { get; set; }
+ string Path { get; set; }
+ string ResolvedPath { get; }
+ }
+}
diff --git a/umbraco/presentation.ClientDependency/ProviderDependencyList.cs b/umbraco/presentation.ClientDependency/ProviderDependencyList.cs
new file mode 100644
index 0000000000..d31ddad974
--- /dev/null
+++ b/umbraco/presentation.ClientDependency/ProviderDependencyList.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using umbraco.presentation.ClientDependency.Providers;
+
+namespace umbraco.presentation.ClientDependency
+{
+ internal class ProviderDependencyList
+ {
+ internal ProviderDependencyList(ClientDependencyProvider provider)
+ {
+ Provider = provider;
+ Dependencies = new ClientDependencyCollection();
+ }
+
+ internal bool Contains(ClientDependencyProvider provider)
+ {
+ return Provider.Name == provider.Name;
+ }
+
+ internal void AddDependencies(ClientDependencyCollection list)
+ {
+ Dependencies.UnionWith(list);
+ }
+
+ internal void AddDependency(IClientDependencyFile file)
+ {
+ Dependencies.Add(file);
+ }
+
+ internal ClientDependencyCollection Dependencies { get; private set; }
+ internal ClientDependencyProvider Provider { get; private set; }
+ }
+}
diff --git a/umbraco/presentation.ClientDependency/Providers/ClientDependencyProvider.cs b/umbraco/presentation.ClientDependency/Providers/ClientDependencyProvider.cs
index 7dcb3faaf8..f4af093a1f 100644
--- a/umbraco/presentation.ClientDependency/Providers/ClientDependencyProvider.cs
+++ b/umbraco/presentation.ClientDependency/Providers/ClientDependencyProvider.cs
@@ -12,7 +12,7 @@ namespace umbraco.presentation.ClientDependency.Providers
public abstract class ClientDependencyProvider : ProviderBase
{
protected Control DependantControl { get; private set; }
- protected ClientDependencyPathCollection FolderPaths { get; private set; }
+ protected HashSet FolderPaths { get; private set; }
protected List AllDependencies { get; private set; }
///
@@ -27,7 +27,7 @@ namespace umbraco.presentation.ClientDependency.Providers
public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
{
- IsDebugMode = false;
+ IsDebugMode = true;
if (config != null && config["isDebug"] != null)
{
bool isDebug;
@@ -38,7 +38,7 @@ namespace umbraco.presentation.ClientDependency.Providers
base.Initialize(name, config);
}
- public void RegisterDependencies(Control dependantControl, ClientDependencyList dependencies, ClientDependencyPathCollection paths)
+ public void RegisterDependencies(Control dependantControl, ClientDependencyCollection dependencies, HashSet paths)
{
DependantControl = dependantControl;
AllDependencies = new List(dependencies);
@@ -46,19 +46,13 @@ namespace umbraco.presentation.ClientDependency.Providers
UpdateFilePaths();
- //seperate the types into 2 lists for all dependencies without composite groups
- List jsDependencies = AllDependencies.FindAll(
- delegate(IClientDependencyFile a)
- {
- return a.DependencyType == ClientDependencyType.Javascript;
- }
- );
- List cssDependencies = AllDependencies.FindAll(
- delegate(IClientDependencyFile a)
- {
- return a.DependencyType == ClientDependencyType.Css;
- }
- );
+ List jsDependencies = AllDependencies
+ .Where(x => x.DependencyType == ClientDependencyType.Javascript)
+ .ToList();
+
+ List cssDependencies = AllDependencies
+ .Where(x => x.DependencyType == ClientDependencyType.Css)
+ .ToList();
// sort by priority
jsDependencies.Sort((a, b) => a.Priority.CompareTo(b.Priority));
@@ -81,10 +75,10 @@ namespace umbraco.presentation.ClientDependency.Providers
///
protected virtual void RegisterStartupScripts(List dependencies)
{
- foreach (var js in dependencies)
- {
- DependantControl.Page.ClientScript.RegisterStartupScript(this.GetType(), js.GetHashCode().ToString(), js.InvokeJavascriptMethodOnLoad, true);
- }
+ //foreach (var js in dependencies)
+ //{
+ // DependantControl.Page.ClientScript.RegisterStartupScript(this.GetType(), js.GetHashCode().ToString(), js.InvokeJavascriptMethodOnLoad, true);
+ //}
}
///
@@ -149,8 +143,9 @@ namespace umbraco.presentation.ClientDependency.Providers
{
if (!string.IsNullOrEmpty(dependency.PathNameAlias))
{
- ClientDependencyPath path = FolderPaths.Find(
- delegate(ClientDependencyPath p)
+ List paths = FolderPaths.ToList();
+ IClientDependencyPath path = paths.Find(
+ delegate(IClientDependencyPath p)
{
return p.Name == dependency.PathNameAlias;
}
diff --git a/umbraco/presentation.ClientDependency/UmbracoDependencyLoader.js b/umbraco/presentation.ClientDependency/UmbracoDependencyLoader.js
index bb4c224776..319aced209 100644
--- a/umbraco/presentation.ClientDependency/UmbracoDependencyLoader.js
+++ b/umbraco/presentation.ClientDependency/UmbracoDependencyLoader.js
@@ -114,7 +114,10 @@ Umbraco.Sys.onScriptAvailable = function(script) {
if (typeof (eval(script.callbackMethod)) == 'function') {
UmbDependencyLoader.LoadNextJs();
Sys.Debug.trace("UmbracoDependencyLoader: Executing '" + script.filePath + "' callback '" + script.callbackMethod + "'.");
- eval(script.callbackMethod + "()");
+ var func = eval(script.callbackMethod);
+ alert(func);
+ func.call(this);
+ //eval(script.callbackMethod + "()");
}
else {
setTimeout(function() {
diff --git a/umbraco/presentation.ClientDependency/umbraco.presentation.ClientDependency.csproj b/umbraco/presentation.ClientDependency/umbraco.presentation.ClientDependency.csproj
index 6f00a71ea6..e2dbe51025 100644
--- a/umbraco/presentation.ClientDependency/umbraco.presentation.ClientDependency.csproj
+++ b/umbraco/presentation.ClientDependency/umbraco.presentation.ClientDependency.csproj
@@ -51,8 +51,10 @@
+
TreeControl.ascx
-
+
Code
diff --git a/umbraco/presentation/umbraco/LiveEditing/Controls/Communicator.cs b/umbraco/presentation/umbraco/LiveEditing/Controls/Communicator.cs
index b9f4138db6..b952be14db 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Controls/Communicator.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Controls/Communicator.cs
@@ -1,12 +1,14 @@
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
+using umbraco.presentation.ClientDependency;
namespace umbraco.presentation.LiveEditing.Controls
{
///
/// Control that can receive messages from the client.
///
+ [ClientDependency(100, ClientDependencyType.Javascript, "LiveEditing/Controls/Communicator.js", "UmbracoRoot")]
public class Communicator : Control
{
///
@@ -70,8 +72,8 @@ namespace umbraco.presentation.LiveEditing.Controls
m_SubmitButton.Click += new EventHandler(SubmitButton_Click);
m_MainPanel.ContentTemplateContainer.Controls.Add(m_SubmitButton);
- ScriptManager.RegisterClientScriptInclude(this, GetType(), ScriptFile,
- string.Format(ScriptFile, GlobalSettings.Path));
+ ScriptManager.RegisterClientScriptInclude(this, GetType(), ScriptFile,
+ string.Format(ScriptFile, GlobalSettings.Path));
}
///
diff --git a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs
index 8b92d08780..067bebad14 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs
@@ -3,7 +3,11 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using umbraco.presentation.LiveEditing.Modules.ItemEditing;
-using umbraco.cms.businesslogic.datatype;
+using umbraco.presentation.ClientDependency;
+using umbraco.presentation.ClientDependency.Providers;
+using umbraco.presentation.ClientDependency.Controls;
+using umbraco.BasePages;
+using System.Collections.Generic;
namespace umbraco.presentation.LiveEditing.Controls
{
@@ -12,9 +16,9 @@ namespace umbraco.presentation.LiveEditing.Controls
/// Provides public properties, events and methods for Live Editing controls.
/// Add this control to a (master) page to enable Live Editing.
///
- [ClientDependency(1, ClientDependencyType.Css, "LiveEditing/CSS/LiveEditing.css", true)]
- [ClientDependency(1, ClientDependencyType.Javascript, "/umbraco_client/ui/jquery.js", false, "_jQueryNoConflict = function(){jQuery.noConflict();}")]
- [ClientDependency(2, ClientDependencyType.Javascript, "js/UmbracoSpeechBubble.js", true)]
+ [ClientDependency(1, ClientDependencyType.Css, "LiveEditing/CSS/LiveEditing.css", "UmbracoRoot")]
+ [ClientDependency(1, ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", InvokeJavascriptMethodOnLoad = "_jQueryNoConflict = function(){jQuery.noConflict();};")]
+ [ClientDependency(10, ClientDependencyType.Javascript, "js/UmbracoSpeechBubble.js", "UmbracoRoot")]
public class LiveEditingManager : Control
{
@@ -90,11 +94,10 @@ namespace umbraco.presentation.LiveEditing.Controls
EnsureChildControls();
}
- protected override void OnLoad(EventArgs e)
- {
- base.OnLoad(e);
- ClientDependencyHelper.AddClientDependencies(this);
- }
+ protected override void OnPreRender(EventArgs e)
+ {
+ base.OnPreRender(e);
+ }
///
/// Called by the ASP.NET page framework to notify server controls
@@ -105,6 +108,14 @@ namespace umbraco.presentation.LiveEditing.Controls
{
base.CreateChildControls();
+ //we need a DependencyLoader control
+ bool isNew;
+ ClientDependencyLoader.TryCreate(this, out isNew)
+ .AddPath("UmbracoClient", GlobalSettings.ClientPath)
+ .AddPath("UmbracoRoot", GlobalSettings.Path)
+ .EmbedType = ClientDependencyEmbedType.ClientSideRegistration;
+ ClientDependencyLoader.Instance.IsDebugMode = true;
+
m_Communicator = new Communicator();
Controls.Add(m_Communicator);
@@ -136,11 +147,20 @@ namespace umbraco.presentation.LiveEditing.Controls
/// Unescaped title text.
/// Unescaped message text.
/// The icon.
+ [Obsolete("Use the ClientTools library instead: 'ShowSpeechBubble' method.")]
public virtual void DisplayUserMessage(string title, string message, string icon)
{
- ScriptManager.RegisterClientScriptBlock(Page, GetType(), new Guid().ToString(),
- string.Format("UmbSpeechBubble.ShowMessage('{2}','{0}','{1}');",
- EscapeJavascriptString(title), EscapeJavascriptString(message), EscapeJavascriptString(icon)), true);
+ ClientTools cTools = new ClientTools(Page);
+ BasePage.speechBubbleIcon ico = BasePage.speechBubbleIcon.info;
+ try
+ {
+ ico = (BasePage.speechBubbleIcon)(Enum.Parse(typeof(BasePage.speechBubbleIcon), icon));
+ }
+ catch { }
+ cTools.ShowSpeechBubble(BasePage.speechBubbleIcon.info, title, message);
+ //ScriptManager.RegisterClientScriptBlock(Page, GetType(), new Guid().ToString(),
+ // string.Format("UmbSpeechBubble.ShowMessage('{2}','{0}','{1}');",
+ // EscapeJavascriptString(title), EscapeJavascriptString(message), EscapeJavascriptString(icon)), true);
}
#endregion
diff --git a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
index fef20a9349..4b5407ff5a 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
@@ -7,19 +7,19 @@ using umbraco.presentation.LiveEditing.Modules.DeleteModule;
using umbraco.presentation.LiveEditing.Modules.ItemEditing;
//using umbraco.presentation.LiveEditing.Modules.MacroEditing;
using umbraco.presentation.LiveEditing.Modules.UnpublishModule;
-using umbraco.cms.businesslogic.datatype;
+
using umbraco.BasePages;
using umbraco.cms.businesslogic.web;
using umbraco.BusinessLogic.Actions;
using umbraco.presentation.umbraco.controls;
-
+using umbraco.presentation.ClientDependency;
namespace umbraco.presentation.LiveEditing.Controls
{
///
/// The default toolbar used for Live Editing.
///
- [ClientDependency(1, ClientDependencyType.Javascript, "/umbraco_client/ui/jquery.js", false)]
- [ClientDependency(2, ClientDependencyType.Javascript, "LiveEditing/Controls/LiveEditingToolbar.js", true)]
+ [ClientDependency(1, ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient")]
+ [ClientDependency(20, ClientDependencyType.Javascript, "LiveEditing/Controls/LiveEditingToolbar.js", "UmbracoRoot")]
public class LiveEditingToolbar : Control
{
#region Protected Constants
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
index cf424d9fbf..49bef0a383 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
@@ -6,12 +6,13 @@ using umbraco.cms.businesslogic.web;
using umbraco.presentation.LiveEditing.Controls;
using Content = umbraco.cms.businesslogic.Content;
using umbraco.BusinessLogic.Actions;
-
+using umbraco.presentation.ClientDependency;
namespace umbraco.presentation.LiveEditing.Modules.CreateModule
{
+ [ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/CreateModule/CreateModule.js", "UmbracoRoot")]
public class CreateModule : BaseModule
{
- protected const string CreateModuleScriptFile = "{0}/LiveEditing/Modules/CreateModule/CreateModule.js";
+ //protected const string CreateModuleScriptFile = "{0}/LiveEditing/Modules/CreateModule/CreateModule.js";
protected ImageButton m_CreateButton = new ImageButton();
@@ -84,7 +85,7 @@ namespace umbraco.presentation.LiveEditing.Modules.CreateModule
m_CreateModal.Controls.Add(new LiteralControl("
"));
- ScriptManager.RegisterClientScriptInclude(this, GetType(), CreateModuleScriptFile, String.Format(CreateModuleScriptFile, GlobalSettings.Path));
+ //ScriptManager.RegisterClientScriptInclude(this, GetType(), CreateModuleScriptFile, String.Format(CreateModuleScriptFile, GlobalSettings.Path));
}
private void FillAllowedDoctypes()
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
index 92c88986ef..2e5eb644c7 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
@@ -5,12 +5,13 @@ using AjaxControlToolkit;
using umbraco.cms.businesslogic.web;
using umbraco.presentation.LiveEditing.Controls;
using umbraco.BusinessLogic.Actions;
-
+using umbraco.presentation.ClientDependency;
namespace umbraco.presentation.LiveEditing.Modules.DeleteModule
{
+ [ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/DeleteModule/DeleteModule.js", "UmbracoRoot")]
public class DeleteModule : BaseModule
{
- protected const string DeleteModuleScriptFile = "{0}/LiveEditing/Modules/DeleteModule/DeleteModule.js";
+ //protected const string DeleteModuleScriptFile = "{0}/LiveEditing/Modules/DeleteModule/DeleteModule.js";
protected ImageButton m_DeleteButton = new ImageButton();
@@ -72,7 +73,7 @@ namespace umbraco.presentation.LiveEditing.Modules.DeleteModule
m_DeleteModal.Controls.Add(new LiteralControl("Send newsletter to all...
"); writer.WriteLine("Please confirm that you want to send this message to " + mailerLogic.GetTotalReceiptients(mg).ToString() + " recipients
"); @@ -120,26 +125,26 @@ namespace umbraco.editorControls.ultraSimpleMailer } - + public object[] MenuIcons { get { - object[] _buttons = { }; + object[] _buttons = { }; ArrayList buttons = new ArrayList(); - for (int i=0;i<_buttons.Length;i++) + for (int i = 0; i < _buttons.Length; i++) buttons.Add(_buttons[i]); // Add the two new buttons - MenuIconI menuItemSend = new MenuIconClass(); + MenuIconI menuItemSend = new MenuIconClass(); menuItemSend.OnClickCommand = "ultraSimpleMailer_doSend('" + this.ClientID + "')"; menuItemSend.ImageURL = "/umbraco_client/ultraSimpleMailer/images/newsletterSend.gif"; menuItemSend.AltText = "Send newsletter to all"; menuItemSend.ID = "sendToAll"; buttons.Insert(0, menuItemSend); - - MenuIconI menuItemTest = new MenuIconClass(); + + MenuIconI menuItemTest = new MenuIconClass(); menuItemTest.OnClickCommand = "ultraSimpleMailer_doSendTest('" + this.ClientID + "')"; menuItemTest.ImageURL = "/umbraco_client/ultraSimpleMailer/images/newsletterSendTest.gif"; menuItemTest.AltText = "Test newsletter by sending to a mail address you specify"; @@ -148,8 +153,8 @@ namespace umbraco.editorControls.ultraSimpleMailer buttons.Insert(2, "|"); // Re-create the button array - _buttons = new object[buttons.Count]; - for (int i=0;i