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

DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB

Browse Source 
Resolves 23626. ClientDependency work.

[TFS Changeset #57219]
This commit is contained in:
Shandem
2009-07-26 15:13:15 +00:00
parent 9e9598cbb5
commit 9a46338123
72 changed files with 830 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/editorControls/tinymce/TinyMCE.cs
View File

@@ -320,7 +320,7 @@ namespace umbraco.editorControls.tinymce {
}
protected override void Render(HtmlTextWriter output) {
base.JavascriptLocation = "/umbraco_client/tinymce/tiny_mce.js";
base.JavascriptLocation = GlobalSettings.ClientPath + "/tinymce/tiny_mce.js";
base.Render(output);
}

4
components/editorControls/tinymce/webcontrol/TinyMCE.cs
View File

@@ -13,7 +13,7 @@ using Content = umbraco.cms.businesslogic.Content;
namespace umbraco.editorControls.tinymce.webcontrol {
public class TinyMCE : WebControl, IPostBackDataHandler {
private string _javascriptLocation = "/umbraco_client/tinymce";
private string _javascriptLocation = GlobalSettings.ClientPath + "/tinymce";
private string _coreFile = "/tiny_mce.js";
private int _rows = 13;
private int _cols = 60;
@@ -91,7 +91,7 @@ namespace umbraco.editorControls.tinymce.webcontrol {
/// <param name="outWriter">The writer to draw the editor to</param>
protected override void Render(HtmlTextWriter writer) {
writer.WriteLine("<!-- tinyMCE -->\n");
// writer.WriteLine("<script language=\"javascript\" type=\"text/javascript\" src=\"" + JavascriptLocation + "\"/>\n");
writer.WriteLine("<script language=\"javascript\" type=\"text/javascript\">");
writer.WriteLine("tinyMCE.init({");