From 8ac0e2fa54ecf3069872f017abe5eb57e07b58b8 Mon Sep 17 00:00:00 2001 From: Shandem Date: Mon, 8 Feb 2010 02:22:42 +0000 Subject: [PATCH] WORK IN PROGRESS, GET THE STABLE SOURCE FROM THE THE DOWNLOADS TABS Mega Commit: New controls: tree control, pickers of all sorts, image viewer, media uploader. Removed a zillion iframes. New modal window standard framework. Fixes some bugs. ClientDependency & Examine DLL updates. Lots of JS enhancements, libs and more methods added to ClientTools. [TFS Changeset #63838] --- UpgradeReadme.txt | 15 +- .../editorControls/BaseTreePickerEditor.cs | 80 + .../editorControls/macrocontainer/Editor.cs | 20 +- .../macrocontainer/MacroControlFactory.cs | 39 +- .../MediaChooserScripts.Designer.cs | 83 + .../mediapicker/MediaChooserScripts.resx | 124 + .../editorControls/mediapicker/MediaPicker.js | 52 + .../mediapicker/mediaChooser.cs | 328 ++- .../editorControls/pagepicker/pagePicker.cs | 117 +- .../umbraco.editorControls.csproj | 17 +- components/macroRenderings/content.cs | 112 +- components/macroRenderings/media.cs | 117 +- .../umbraco.macroRenderings.csproj | 4 + components/umbraco.controls/CodeArea.cs | 2 + .../TreePicker/BaseTreePicker.cs | 223 ++ .../TreePicker/BaseTreePicker.js | 70 + .../BaseTreePickerScripts.Designer.cs | 83 + .../TreePicker/BaseTreePickerScripts.resx | 124 + .../TreePicker/SimpleContentPicker.cs | 26 + .../TreePicker/SimpleMediaPicker.cs | 26 + .../umbraco.controls/TreeUrlGenerator.cs | 202 ++ components/umbraco.controls/feedback.cs | 2 +- .../umbraco.controls/umbraco.controls.csproj | 30 +- foreign dlls/ClientDependency.Core.dll | Bin 56320 -> 54784 bytes foreign dlls/UmbracoExamine.Core.dll | Bin 27648 -> 30208 bytes foreign dlls/UmbracoExamine.Providers.dll | Bin 27136 -> 41472 bytes umbraco/businesslogic/Application.cs | 2 +- .../businesslogic/BasePages/ClientTools.cs | 47 +- umbraco/businesslogic/Utils/TypeFinder.cs | 43 +- umbraco/cms/Actions/Action.cs | 4 +- .../PackageInstance/PackageActions.cs | 2 +- umbraco/cms/businesslogic/datatype/factory.cs | 2 +- umbraco/cms/umbraco.cms.csproj | 4 - umbraco/interfaces/IDataEditor.cs | 12 - .../interfaces/IDataEditorAjaxAlternative.cs | 16 + umbraco/interfaces/umbraco.interfaces.csproj | 1 + .../presentation/config/ExamineIndex.config | 5 +- .../config/ExamineSettings.config | 8 +- umbraco/presentation/install/default.aspx | 7 +- .../install/default.aspx.designer.cs | 9 + .../presentation/umbraco.presentation.csproj | 63 +- .../Controls/LiveEditingManager.cs | 14 +- .../Modules/CreateModule/CreateModule.cs | 20 +- .../Modules/ItemEditing/ItemEditor.cs | 5 +- .../umbraco/Trees/BaseContentTree.cs | 36 +- .../umbraco/Trees/BaseMediaTree.cs | 28 +- .../presentation/umbraco/Trees/BaseTree.cs | 1 + .../umbraco/Trees/ContentRecycleBin.cs | 6 + .../umbraco/Trees/ITreeService.cs | 44 + .../umbraco/Trees/MediaRecycleBin.cs | 6 + .../umbraco/Trees/TreeDefinitionCollection.cs | 2 +- .../umbraco/Trees/TreeRequestParams.cs | 153 ++ .../presentation/umbraco/Trees/TreeService.cs | 291 +-- .../presentation/umbraco/Trees/loadMedia.cs | 2 +- umbraco/presentation/umbraco/cache/factory.cs | 2 +- .../umbraco/controls/ContentPicker.cs | 159 +- .../controls/ContentTypeControlNew.ascx.cs | 2 +- .../GenericProperties/GenericProperty.ascx | 4 - .../GenericProperties/GenericProperty.ascx.cs | 2 +- .../GenericProperty.ascx.designer.cs | 2 +- .../umbraco/controls/Images/ImageViewer.ascx | 48 + .../controls/Images/ImageViewer.ascx.cs | 116 + .../Images/ImageViewer.ascx.designer.cs | 25 + .../umbraco/controls/Images/ImageViewer.js | 133 + .../controls/Images/ImageViewerUpdater.asmx | 1 + .../Images/ImageViewerUpdater.asmx.cs | 68 + .../controls/Images/UploadMediaImage.ascx | 28 + .../controls/Images/UploadMediaImage.ascx.cs | 117 + .../Images/UploadMediaImage.ascx.designer.cs | 109 + .../controls/Images/UploadMediaImage.js | 33 + .../umbraco/controls/Tree/JTreeContextMenu.cs | 44 + .../controls/Tree/JTreeContextMenuItem.cs | 93 + .../controls/{ => Tree}/TreeControl.ascx | 53 +- .../umbraco/controls/Tree/TreeControl.ascx.cs | 390 +++ .../{ => Tree}/TreeControl.ascx.designer.cs | 13 +- .../umbraco/controls/TreeControl.ascx.cs | 383 --- .../presentation/umbraco/create/content.ascx | 2 +- .../umbraco/create/content.ascx.designer.cs | 2 +- .../presentation/umbraco/create/language.ascx | 2 +- .../umbraco/create/language.ascx.designer.cs | 2 +- .../presentation/umbraco/create/media.ascx | 2 +- .../umbraco/create/media.ascx.designer.cs | 2 +- .../presentation/umbraco/create/member.ascx | 2 +- .../umbraco/create/member.ascx.designer.cs | 2 +- .../presentation/umbraco/create/nodeType.ascx | 2 +- .../umbraco/create/nodeType.ascx.designer.cs | 2 +- .../presentation/umbraco/create/script.ascx | 2 +- .../umbraco/create/script.ascx.designer.cs | 2 +- .../presentation/umbraco/create/simple.ascx | 2 +- .../umbraco/create/simple.ascx.designer.cs | 2 +- umbraco/presentation/umbraco/create/xslt.ascx | 2 +- .../umbraco/create/xslt.ascx.designer.cs | 2 +- .../umbraco/css/permissionsEditor.css | 12 + .../developer/Macros/assemblyBrowser.aspx | 4 +- .../Macros/assemblyBrowser.aspx.designer.cs | 2 +- .../developer/Macros/editMacro.aspx.cs | 16 +- .../umbraco/developer/Packages/Boost.aspx | 2 +- .../developer/Packages/Boost.aspx.designer.cs | 2 +- .../developer/Packages/directoryBrowser.aspx | 2 +- .../directoryBrowser.aspx.designer.cs | 2 +- .../developer/Packages/editPackage.aspx | 6 +- .../Packages/editPackage.aspx.designer.cs | 2 +- .../developer/Packages/installedPackage.aspx | 2 +- .../installedPackage.aspx.designer.cs | 2 +- .../umbraco/developer/Xslt/editXslt.aspx | 2 +- .../umbraco/developer/Xslt/editXslt.aspx.cs | 6 +- .../developer/Xslt/editXslt.aspx.designer.cs | 2 +- .../developer/Xslt/xsltInsertValueOf.aspx | 4 +- .../Xslt/xsltInsertValueOf.aspx.designer.cs | 2 +- .../umbraco/developer/Xslt/xsltVisualize.aspx | 10 +- .../developer/Xslt/xsltVisualize.aspx.cs | 15 +- .../Xslt/xsltVisualize.aspx.designer.cs | 2 +- .../umbraco/dialogs/AssignDomain.aspx | 2 +- .../dialogs/AssignDomain.aspx.designer.cs | 2 +- .../umbraco/dialogs/ExportCode.aspx | 2 +- .../dialogs/ExportCode.aspx.designer.cs | 2 +- .../presentation/umbraco/dialogs/RegexWs.aspx | 2 +- .../umbraco/dialogs/RegexWs.aspx.designer.cs | 2 +- .../umbraco/dialogs/SendPublish.aspx | 2 +- .../dialogs/SendPublish.aspx.designer.cs | 2 +- .../presentation/umbraco/dialogs/create.aspx | 143 +- .../umbraco/dialogs/create.aspx.cs | 73 +- .../umbraco/dialogs/create.aspx.designer.cs | 29 +- .../presentation/umbraco/dialogs/cruds.aspx | 2 +- .../umbraco/dialogs/cruds.aspx.designer.cs | 2 +- .../umbraco/dialogs/editMacro.aspx | 6 +- .../dialogs/editMacro.aspx.designer.cs | 2 +- .../umbraco/dialogs/emptyTrashcan.aspx | 4 +- .../dialogs/emptyTrashcan.aspx.designer.cs | 2 +- .../umbraco/dialogs/imageViewer.aspx.cs | 23 +- .../dialogs/imageViewer.aspx.designer.cs | 2 +- .../umbraco/dialogs/importDocumenttype.aspx | 2 +- .../umbraco/dialogs/insertMacro.aspx | 10 +- .../dialogs/insertMacro.aspx.designer.cs | 2 +- .../dialogs/insertMasterpageContent.aspx | 4 +- .../insertMasterpageContent.aspx.designer.cs | 2 +- .../dialogs/insertMasterpagePlaceholder.aspx | 4 +- ...sertMasterpagePlaceholder.aspx.designer.cs | 2 +- .../umbraco/dialogs/mediaPicker.aspx | 148 +- .../umbraco/dialogs/mediaPicker.aspx.cs | 7 +- .../dialogs/mediaPicker.aspx.designer.cs | 101 +- .../umbraco/dialogs/moveOrCopy.aspx | 19 +- .../umbraco/dialogs/moveOrCopy.aspx.cs | 6 +- .../dialogs/moveOrCopy.aspx.designer.cs | 11 +- .../umbraco/dialogs/notifications.aspx | 2 +- .../umbraco/dialogs/notifications.aspx.cs | 2 +- .../dialogs/notifications.aspx.designer.cs | 2 +- .../umbraco/dialogs/protectPage.aspx | 4 +- .../umbraco/dialogs/protectPage.aspx.cs | 4 +- .../dialogs/protectPage.aspx.designer.cs | 2 +- .../presentation/umbraco/dialogs/publish.aspx | 2 +- .../umbraco/dialogs/publish.aspx.cs | 6 +- .../umbraco/dialogs/publish.aspx.designer.cs | 2 +- .../umbraco/dialogs/republish.aspx | 4 +- .../dialogs/republish.aspx.designer.cs | 2 +- .../umbraco/dialogs/rollBack.aspx | 2 +- .../umbraco/dialogs/rollBack.aspx.cs | 2 +- .../umbraco/dialogs/rollBack.aspx.designer.cs | 2 +- .../presentation/umbraco/dialogs/search.aspx | 4 +- .../umbraco/dialogs/search.aspx.designer.cs | 2 +- .../umbraco/dialogs/sendToTranslation.aspx | 2 +- .../umbraco/dialogs/sendToTranslation.aspx.cs | 2 +- .../sendToTranslation.aspx.designer.cs | 2 +- .../presentation/umbraco/dialogs/sort.aspx | 4 +- .../umbraco/dialogs/sort.aspx.designer.cs | 2 +- .../umbraco/dialogs/treePicker.aspx | 100 +- .../umbraco/dialogs/treePicker.aspx.cs | 33 +- .../dialogs/treePicker.aspx.designer.cs | 15 +- .../umbraco/dialogs/umbracoField.aspx | 4 +- .../dialogs/umbracoField.aspx.designer.cs | 2 +- .../umbraco/dialogs/uploadImage.aspx | 80 +- .../umbraco/dialogs/uploadImage.aspx.cs | 90 +- .../dialogs/uploadImage.aspx.designer.cs | 87 +- .../presentation/umbraco/images/throbber.gif | Bin 0 -> 1844 bytes .../umbraco/masterpages/umbracoPage.Master | 5 +- .../umbracoPage.Master.designer.cs | 29 +- .../umbraco/plugins/tinymce3/insertImage.aspx | 490 +--- .../plugins/tinymce3/insertImage.aspx.cs | 6 +- .../tinymce3/insertImage.aspx.designer.cs | 60 +- .../umbraco/plugins/tinymce3/insertLink.aspx | 12 +- .../plugins/tinymce3/insertLink.aspx.cs | 5 +- .../tinymce3/insertLink.aspx.designer.cs | 20 +- .../umbraco/plugins/tinymce3/insertMacro.aspx | 5 +- .../plugins/tinymce3/insertMacro.aspx.cs | 16 +- .../tinymce3/insertMacro.aspx.designer.cs | 2 +- .../umbraco/settings/editTemplate.aspx.cs | 18 +- .../settings/modals/ShowUmbracoTags.aspx | 110 +- umbraco/presentation/umbraco/test.aspx.cs | 3 +- umbraco/presentation/umbraco/treeInit.aspx | 8 +- umbraco/presentation/umbraco/treeInit.aspx.cs | 18 +- .../umbraco/treeInit.aspx.designer.cs | 4 +- umbraco/presentation/umbraco/umbraco.aspx | 181 +- umbraco/presentation/umbraco/umbraco.aspx.cs | 18 +- .../umbraco/umbraco.aspx.designer.cs | 4 +- .../umbraco/users/PermissionEditor.aspx | 7 +- .../umbraco/users/PermissionEditor.aspx.cs | 9 +- .../users/PermissionEditor.aspx.designer.cs | 4 +- .../umbraco/users/PermissionsEditor.js | 3 +- .../webservices/TreeClientService.asmx.cs | 26 +- .../Application/JQuery/VerticalAlign.js | 8 + .../Application/JQuery/jquery.autocomplete.js | 2 +- .../JQuery/jquery.noconflict-invoke.js | 3 + .../Application/UmbracoApplicationActions.js | 42 +- .../Application/UmbracoClientManager.js | 34 +- .../umbraco_client/Application/UrlEncoder.js | 73 + .../Tree/Themes/umbraco/style.css | 2 +- .../umbraco_client/Tree/UmbracoTree.js | 254 +- .../umbraco_client/Tree/tree_component.js | 2315 ----------------- .../umbraco_client/Tree/tree_component.min.js | 14 - .../umbraco_client/modal/modal.js | 214 +- .../umbraco_client/modal/style.css | 38 +- .../umbraco_client/ui/default.css | 20 +- umbraco/presentation/web.config.BOMBER.xslt | 21 - .../presentation/web.config.SHANDEMVAIO.xslt | 9 +- umbraco/presentation/web.config.SHOCKING.xslt | 8 +- umbraco/umbraco.Legacy/umbraco.Legacy.csproj | 4 + .../umbraco/js/submodal/common.js | 0 .../umbraco/js/submodal/maskBG.png | Bin .../umbraco/js/submodal/subModal.css | 0 .../umbraco/js/submodal/subModal.js | 0 220 files changed, 4460 insertions(+), 5436 deletions(-) create mode 100644 components/editorControls/BaseTreePickerEditor.cs create mode 100644 components/editorControls/mediapicker/MediaChooserScripts.Designer.cs create mode 100644 components/editorControls/mediapicker/MediaChooserScripts.resx create mode 100644 components/editorControls/mediapicker/MediaPicker.js create mode 100644 components/umbraco.controls/TreePicker/BaseTreePicker.cs create mode 100644 components/umbraco.controls/TreePicker/BaseTreePicker.js create mode 100644 components/umbraco.controls/TreePicker/BaseTreePickerScripts.Designer.cs create mode 100644 components/umbraco.controls/TreePicker/BaseTreePickerScripts.resx create mode 100644 components/umbraco.controls/TreePicker/SimpleContentPicker.cs create mode 100644 components/umbraco.controls/TreePicker/SimpleMediaPicker.cs create mode 100644 components/umbraco.controls/TreeUrlGenerator.cs create mode 100644 umbraco/interfaces/IDataEditorAjaxAlternative.cs create mode 100644 umbraco/presentation/umbraco/Trees/ITreeService.cs create mode 100644 umbraco/presentation/umbraco/Trees/TreeRequestParams.cs create mode 100644 umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx create mode 100644 umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.cs create mode 100644 umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.designer.cs create mode 100644 umbraco/presentation/umbraco/controls/Images/ImageViewer.js create mode 100644 umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx create mode 100644 umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs create mode 100644 umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx create mode 100644 umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs create mode 100644 umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs create mode 100644 umbraco/presentation/umbraco/controls/Images/UploadMediaImage.js create mode 100644 umbraco/presentation/umbraco/controls/Tree/JTreeContextMenu.cs create mode 100644 umbraco/presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs rename umbraco/presentation/umbraco/controls/{ => Tree}/TreeControl.ascx (60%) create mode 100644 umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.cs rename umbraco/presentation/umbraco/controls/{ => Tree}/TreeControl.ascx.designer.cs (89%) delete mode 100644 umbraco/presentation/umbraco/controls/TreeControl.ascx.cs create mode 100644 umbraco/presentation/umbraco/images/throbber.gif create mode 100644 umbraco/presentation/umbraco_client/Application/JQuery/VerticalAlign.js create mode 100644 umbraco/presentation/umbraco_client/Application/JQuery/jquery.noconflict-invoke.js create mode 100644 umbraco/presentation/umbraco_client/Application/UrlEncoder.js delete mode 100644 umbraco/presentation/umbraco_client/Tree/tree_component.js delete mode 100644 umbraco/presentation/umbraco_client/Tree/tree_component.min.js delete mode 100644 umbraco/presentation/web.config.BOMBER.xslt rename umbraco/{presentation => umbraco.Legacy}/umbraco/js/submodal/common.js (100%) rename umbraco/{presentation => umbraco.Legacy}/umbraco/js/submodal/maskBG.png (100%) rename umbraco/{presentation => umbraco.Legacy}/umbraco/js/submodal/subModal.css (100%) rename umbraco/{presentation => umbraco.Legacy}/umbraco/js/submodal/subModal.js (100%) diff --git a/UpgradeReadme.txt b/UpgradeReadme.txt index fff889ef2e..189b5184f9 100644 --- a/UpgradeReadme.txt +++ b/UpgradeReadme.txt @@ -49,4 +49,17 @@ FireBeforeAddToIndex, AfterAddToIndex, FireAfterAddToIndex, Document.Index * Removed /umbraco/webservices/Search.asmx as the SearchItem object has been removed * Removed /umbraco/reindex.aspx -* Removed /umbraco/dialogs/editImage.aspx since it didn't do anything at all \ No newline at end of file +* Removed /umbraco/dialogs/editImage.aspx since it didn't do anything at all + +* MediaPicker has been completely overhauled in regards to the JavaScript implementation and should now work in live editing mode + +* /umbraco/plugins/tinymce3/insertImage.aspx has been overhauled to use the tree control, image viewer control and upload media image control + +* /umbraco/treeInit.aspx has been marked obsolete +** All pages that used to use TreeInit now use TreeControl (except for Legacy project) +* /umbraco/dialog/treePicker.aspx has been marked obsolete +* /umbraco/dialog/uploadImage.aspx has been marked obsolete +* /umbraco/dialog/imageViewer.aspx has been marked obsolete + +* subModal library moved to legacy and no longer used +* JavaScript Modal window framework overhauled and replaced \ No newline at end of file diff --git a/components/editorControls/BaseTreePickerEditor.cs b/components/editorControls/BaseTreePickerEditor.cs new file mode 100644 index 0000000000..5be3ac5499 --- /dev/null +++ b/components/editorControls/BaseTreePickerEditor.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using umbraco.uicontrols.TreePicker; +using umbraco.interfaces; + +namespace umbraco.editorControls +{ + /// + /// A base tree picker class that has all of the functionality built in for an IDataEditor + /// + public abstract class BaseTreePickerEditor : BaseTreePicker, IDataEditor + { + + interfaces.IData _data; + protected int StoredItemId = -1; + + public BaseTreePickerEditor() + : base() { } + + public BaseTreePickerEditor(IData Data) + : base() + { + _data = Data; + } + + private void StoreItemId(IData Data) + { + if (_data != null && _data.Value != null && !String.IsNullOrEmpty(_data.Value.ToString())) + { + int.TryParse(_data.Value.ToString(), out StoredItemId); + } + } + + protected override void OnInit(EventArgs e) + { + StoreItemId(_data); + + base.OnInit(e); + } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + if (!Page.IsPostBack) + { + ItemIdValue.Value = StoredItemId != -1 ? StoredItemId.ToString() : ""; + } + } + + #region IDataField Members + + public System.Web.UI.Control Editor { get { return this; } } + + public virtual bool TreatAsRichTextEditor + { + get { return false; } + } + public bool ShowLabel + { + get + { + return true; + } + } + + public void Save() + { + //_text = helper.Request(this.ClientID); + if (ItemIdValue.Value.Trim() != "") + _data.Value = ItemIdValue.Value.Trim(); + else + _data.Value = null; + } + + #endregion + } +} diff --git a/components/editorControls/macrocontainer/Editor.cs b/components/editorControls/macrocontainer/Editor.cs index f106d1a2c3..72c5108cb1 100644 --- a/components/editorControls/macrocontainer/Editor.cs +++ b/components/editorControls/macrocontainer/Editor.cs @@ -43,18 +43,22 @@ namespace umbraco.editorControls.macrocontainer protected override void OnInit(EventArgs e) { base.OnInit(e); - - - base.Page.ClientScript.RegisterClientScriptBlock(Page.GetType(), "subModal", ""); - + + //SD: This is useless as it won't work in live editing anyways whilst using MS Ajax/ScriptManager for ajax calls if (!UmbracoContext.Current.LiveEditingContext.Enabled) + { presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page); + ScriptManager sm = ScriptManager.GetCurrent(base.Page); + ServiceReference webservicePath = new ServiceReference(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/webservices/MacroContainerService.asmx"); + + if (!sm.Services.Contains(webservicePath)) + sm.Services.Add(webservicePath); + } else + { ClientDependencyLoader.Instance.RegisterDependency("webservices/legacyAjaxCalls.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); - - - - + ClientDependencyLoader.Instance.RegisterDependency("webservices/MacroContainerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); + } _addMacro = new LinkButton(); _addMacro.ID = ID + "_btnaddmacro"; diff --git a/components/editorControls/macrocontainer/MacroControlFactory.cs b/components/editorControls/macrocontainer/MacroControlFactory.cs index e533293793..0915dfa403 100644 --- a/components/editorControls/macrocontainer/MacroControlFactory.cs +++ b/components/editorControls/macrocontainer/MacroControlFactory.cs @@ -27,26 +27,15 @@ namespace umbraco.editorControls.macrocontainer internal static Control GetMacroRenderControlByType(PersistableMacroProperty prop, string uniqueID) { Control macroControl; - //Determine the property type - switch (prop.TypeName.ToLower()) + + Type m = MacroControlTypes.FindLast(delegate(Type macroGuiCcontrol) { return macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName); }); + IMacroGuiRendering typeInstance; + typeInstance = Activator.CreateInstance(m) as IMacroGuiRendering; + if (!string.IsNullOrEmpty(prop.Value)) { - //Use a pagepicker instead of a IMacroGuiRendering control - case "content": - macroControl = new pagePicker(null); - ((pagePicker)macroControl).Value = prop.Value; - break; - ///Default behaviour - default: - Type m = MacroControlTypes.FindLast(delegate(Type macroGuiCcontrol) { return macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName); }); - IMacroGuiRendering typeInstance; - typeInstance = Activator.CreateInstance(m) as IMacroGuiRendering; - if (!string.IsNullOrEmpty(prop.Value)) - { - ((IMacroGuiRendering)typeInstance).Value = prop.Value; - } - macroControl = (Control)typeInstance; - break; + ((IMacroGuiRendering)typeInstance).Value = prop.Value; } + macroControl = (Control)typeInstance; macroControl.ID = uniqueID; return macroControl; @@ -59,17 +48,7 @@ namespace umbraco.editorControls.macrocontainer /// internal static string GetValueFromMacroControl(Control macroControl) { - if (macroControl is pagePicker) - { - //pagePicker Control - return ((pagePicker)macroControl).Value; - } - else - { - ///Macro control - return ((IMacroGuiRendering)macroControl).Value; - } - + return ((IMacroGuiRendering)macroControl).Value; } #endregion @@ -85,7 +64,7 @@ namespace umbraco.editorControls.macrocontainer { //Populate the list with all the types of IMacroGuiRendering _macroControlTypes = new List(); - _macroControlTypes = TypeFinder.FindClassesOfType(true); + _macroControlTypes = TypeFinder.FindClassesOfType(); } return _macroControlTypes; diff --git a/components/editorControls/mediapicker/MediaChooserScripts.Designer.cs b/components/editorControls/mediapicker/MediaChooserScripts.Designer.cs new file mode 100644 index 0000000000..dd92d4f662 --- /dev/null +++ b/components/editorControls/mediapicker/MediaChooserScripts.Designer.cs @@ -0,0 +1,83 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4200 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace umbraco.editorControls.mediapicker { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class MediaChooserScripts { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal MediaChooserScripts() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("umbraco.editorControls.mediapicker.MediaChooserScripts", typeof(MediaChooserScripts).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to /// <reference path="/umbraco_client/Application/NamespaceManager.js" /> + /// + ///Umbraco.Sys.registerNamespace("Umbraco.Controls"); + /// + ///(function($) { + /// + /// Umbraco.Controls.MediaChooser = function(label, hasPreview, mediaIdValueClientID, previewContainerClientID, imgViewerClientID, mediaTitleClientID) { + /// return { + /// _mediaPickerUrl: '/umbraco/dialogs/mediaPicker.aspx', + /// _webServiceUrl: "/umbraco/webservices/legacyAjaxCalls.asmx/GetNodeName", + /// _label: label, + /// [rest of string was truncated]";. + /// + internal static string MediaPicker { + get { + return ResourceManager.GetString("MediaPicker", resourceCulture); + } + } + } +} diff --git a/components/editorControls/mediapicker/MediaChooserScripts.resx b/components/editorControls/mediapicker/MediaChooserScripts.resx new file mode 100644 index 0000000000..7f939d3d99 --- /dev/null +++ b/components/editorControls/mediapicker/MediaChooserScripts.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + MediaPicker.js;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + \ No newline at end of file diff --git a/components/editorControls/mediapicker/MediaPicker.js b/components/editorControls/mediapicker/MediaPicker.js new file mode 100644 index 0000000000..2f87565fc3 --- /dev/null +++ b/components/editorControls/mediapicker/MediaPicker.js @@ -0,0 +1,52 @@ +/// + +Umbraco.Sys.registerNamespace("Umbraco.Controls"); + +(function($) { + Umbraco.Controls.MediaChooser = function(label, mediaIdValueClientID, previewContainerClientID, imgViewerClientID, mediaTitleClientID, mediaPickerUrl, width, height, umbracoPath) { + return { + _mediaPickerUrl: mediaPickerUrl, + _webServiceUrl: umbracoPath + "/webservices/legacyAjaxCalls.asmx/GetNodeName", + _label: label, + _width: width, + _height: height, + _mediaIdValueClientID: mediaIdValueClientID, + _previewContainerClientID: previewContainerClientID, + _imgViewerClientID: imgViewerClientID, + _mediaTitleClientID: mediaTitleClientID, + + LaunchPicker: function() { + var _this = this; + UmbClientMgr.openModalWindow(this._mediaPickerUrl, this._label, true, this._width, this._height, 30, 0, ['#cancelbutton'], function(e) { _this.SaveSelection(e); }); + }, + + SaveSelection: function(e) { + if (!e.outVal) { + return; + } + $("#" + this._mediaIdValueClientID).val(e.outVal); + $("#" + this._previewContainerClientID).show(); + $("#" + this._imgViewerClientID).UmbracoImageViewerAPI().updateImage(e.outVal); + var _this = this; + $.ajax({ + type: "POST", + url: _this._webServiceUrl, + data: '{ "nodeId": ' + e.outVal + ' }', + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function(msg) { + $("#" + _this._mediaTitleClientID).html(msg.d); + $("#" + _this._mediaTitleClientID).parent().show(); + } + }); + }, + + ClearSelection: function() { + $("#" + this._mediaTitleClientID).parent().hide(); + $("#" + this._mediaIdValueClientID).val(''); + $("#" + this._previewContainerClientID).hide(); + } + }; + } + +})(jQuery); \ No newline at end of file diff --git a/components/editorControls/mediapicker/mediaChooser.cs b/components/editorControls/mediapicker/mediaChooser.cs index 109385dc70..4ce4a3beb5 100644 --- a/components/editorControls/mediapicker/mediaChooser.cs +++ b/components/editorControls/mediapicker/mediaChooser.cs @@ -7,201 +7,173 @@ using umbraco.presentation; using ClientDependency.Core.Controls; using umbraco.interfaces; using umbraco.IO; +using umbraco.BasePages; +using umbraco.controls.Images; +using System.Web.UI.WebControls; +using System.Web.UI.HtmlControls; +using System.Resources; +using umbraco.editorControls.mediapicker; +using umbraco.uicontrols.TreePicker; namespace umbraco.editorControls { - /// - /// Summary description for mediaChooser. - /// - [ClientDependency(100, ClientDependencyType.Css, "js/submodal/submodal.css", "UmbracoRoot")] - [ClientDependency(101, ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")] - //TODO: Work out how to include this: , InvokeJavascriptMethodOnLoad = "initPopUp" - [ClientDependency(102, ClientDependencyType.Javascript, "js/submodal/submodal.js", "UmbracoRoot")] + /// + /// Summary description for mediaChooser. + /// [ValidationProperty("Value")] - public class mediaChooser : System.Web.UI.WebControls.HiddenField, IDataEditor - { - interfaces.IData _data; - bool _showpreview; - bool _showadvanced; + public class mediaChooser : BaseTreePickerEditor + { + bool _showpreview; + bool _showadvanced; + protected ImageViewer ImgViewer; + protected HtmlGenericControl PreviewContainer; - public mediaChooser(interfaces.IData Data) + public mediaChooser(IData data) + : base(data) { } + + + public mediaChooser(IData data, bool showPreview, bool showAdvanced) + : base(data) { - _data = Data; + _showpreview = showPreview; + _showadvanced = showAdvanced; + } + + public override string ModalWindowTitle + { + get + { + return ui.GetText("general", "choose") + " " + ui.GetText("sections", "media"); + } + } + + public override string TreePickerUrl + { + get + { + return _showadvanced ? umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/mediaPicker.aspx" : TreeService.GetPickerUrl("media", "media"); + } + } + + protected override string GetJSScript() + { + if (!_showpreview) + { + return base.GetJSScript(); + } + else + { + /* 0 = this control's client id + * 1 = label + * 2 = mediaIdValueClientID + * 3 = previewContainerClientID + * 4 = imgViewerClientID + * 5 = mediaTitleClientID + * 6 = mediaPickerUrl + * 7 = popup width + * 8 = popup height + * 9 = umbraco path + */ + return string.Format(@" + var mc_{0} = new Umbraco.Controls.MediaChooser('{1}','{2}','{3}','{4}','{5}','{6}',{7},{8},'{9}');", + new string[] + { + this.ClientID, + ModalWindowTitle, + ItemIdValue.ClientID, + _showpreview ? PreviewContainer.ClientID : "__NOTSET", + _showpreview ? ImgViewer.ClientID : "_NOTSET", + ItemTitle.ClientID, + TreePickerUrl, + ModalWidth.ToString(), + ModalHeight.ToString(), + umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco).TrimEnd('/') + }); + } + } + + /// + /// Renders the required media picker javascript + /// + protected override void RenderJSComponents() + { + + if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) + { + ScriptManager.RegisterStartupScript(this, this.GetType(), "MediaChooser", MediaChooserScripts.MediaPicker, true); + } + else + { + Page.ClientScript.RegisterClientScriptBlock(typeof(mediaChooser), "MediaChooser", MediaChooserScripts.MediaPicker, true); + } + } + + protected override void CreateChildControls() + { + base.CreateChildControls(); + + //if preview is enabled, add it to the wrapper + if (_showpreview) + { + //create the preview wrapper + PreviewContainer = new HtmlGenericControl("div"); + PreviewContainer.ID = "preview"; + this.Controls.Add(PreviewContainer); + + ImgViewer = (ImageViewer)Page.LoadControl(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/controls/Images/ImageViewer.ascx"); + ImgViewer.ID = "ImgViewer"; + ImgViewer.ViewerStyle = ImageViewer.Style.ImageLink; + + PreviewContainer.Style.Add(HtmlTextWriterStyle.MarginTop, "5px"); + PreviewContainer.Controls.Add(ImgViewer); + } + } + + /// + /// sets the modal width/height based on properties + /// + /// + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + + ModalWidth = _showadvanced ? 530 : 320; + ModalHeight = _showadvanced ? 565 : 400; } protected override void OnPreRender(EventArgs e) { base.OnPreRender(e); - Page.ClientScript.RegisterStartupScript(typeof(IDataEditor), "initPopUp", "jQuery(document).ready(function() { initPopUp(); } );", true); - } - public mediaChooser(interfaces.IData Data, bool ShowPreview, bool ShowAdvanced) - { - _data = Data; - _showpreview = ShowPreview; - _showadvanced = ShowAdvanced; - } - public System.Web.UI.Control Editor { get { return this; } } - #region IDataField Members - - //private string _text; - - public virtual bool TreatAsRichTextEditor - { - get { return false; } - } - - public bool ShowLabel - { - get - { - return true; - } - } - - public void Save() - { - if (base.Value.Trim() != "") - _data.Value = base.Value; - else - _data.Value = null; - } - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - if (_data != null && _data.Value != null && !String.IsNullOrEmpty(_data.Value.ToString())) - { - base.Value = _data.Value.ToString(); - } - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - // We need to make sure we have a reference to the legacy ajax calls in the scriptmanager - if (!UmbracoContext.Current.LiveEditingContext.Enabled) - presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page); - else - ClientDependencyLoader.Instance.RegisterDependency("webservices/legacyAjaxCalls.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); - - // And a reference to the media picker calls - if (!UmbracoContext.Current.LiveEditingContext.Enabled) - { - ScriptManager sm = ScriptManager.GetCurrent(base.Page); - ServiceReference webservicePath = new ServiceReference(SystemDirectories.Webservices + "/MediaPickerService.asmx"); - - if (!sm.Services.Contains(webservicePath)) - sm.Services.Add(webservicePath); - } - else - { - ClientDependencyLoader.Instance.RegisterDependency("webservices/MediaPickerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); - } - } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - - string tempTitle = ""; - int mediaId = -1; - string deleteLink = "   " + ui.Text("delete") + "   "; - try - { - if (base.Value != "") - { - mediaId = int.Parse(base.Value); - tempTitle = new cms.businesslogic.CMSNode(int.Parse(base.Value)).Text; - } - } - catch { } - - string dialog = "\nshowPopWin('" + TreeService.GetPickerUrl(true, "media", "media") + "', 300, 400, " + ClientID + "_saveId)"; - if (_showadvanced) - dialog = "\nshowPopWin('" + SystemDirectories.Umbraco + "/dialogs/mediaPicker.aspx" + "', 500, 530, " + ClientID + "_saveId)"; - - string preview = string.Empty; if (_showpreview) - preview = "\numbraco.presentation.webservices.MediaPickerService.GetThumbNail(treePicker, " + this.ClientID + "_UpdateThumbNail);" + - "\numbraco.presentation.webservices.MediaPickerService.GetFile(treePicker, " + this.ClientID + "_UpdateLink);"; - - - string strScript = "function " + this.ClientID + "_chooseId() {" + - //"\nshowPopWin('" + TreeService.GetPickerUrl(true, "media", "media") + "', 300, 400, " + ClientID + "_saveId)" + - //"\nshowPopWin('" + umbraco.IO.SystemDirectories.Umbraco + "/dialogs/mediaPicker.aspx" + "', 500, 530, " + ClientID + "_saveId)" + - // "\nvar treePicker = window.showModalDialog(, 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no') " + - dialog + - "\n}" + - "\nfunction " + ClientID + "_saveId(treePicker) {" + - "\nsetTimeout('" + ClientID + "_saveIdDo(' + treePicker + ')', 200);" + - "\n}" + - "\nfunction " + ClientID + "_saveIdDo(treePicker) {" + - "\nif (treePicker != undefined) {" + - "\ndocument.getElementById(\"" + this.ClientID + "\").value = treePicker;" + - "\nif (treePicker > 0) {" + - "\numbraco.presentation.webservices.legacyAjaxCalls.GetNodeName(treePicker, " + this.ClientID + "_updateContentTitle" + ");" + - preview+ - "\n} " + - "\n}" + - "\n} " + - "\nfunction " + this.ClientID + "_updateContentTitle(retVal) {" + - "\ndocument.getElementById(\"" + this.ClientID + "_title\").innerHTML = \"\" + retVal + \"" + deleteLink.Replace("\"", "\\\"") + "\";" + - "\n}" + - "\nfunction " + this.ClientID + "_clear() {" + - "\ndocument.getElementById(\"" + this.ClientID + "_title\").innerHTML = \"\";" + - "\ndocument.getElementById(\"" + this.ClientID + "\").value = \"\";" + - "\ndocument.getElementById(\"" + this.ClientID + "_preview\").style.display = 'none';" + - "\n}" + - "\nfunction " + this.ClientID + "_UpdateThumbNail(retVal){" + - "\nif(retVal != \"\"){" + - "\ndocument.getElementById(\"" + this.ClientID + "_thumbnail\").src = retVal;" + - "\ndocument.getElementById(\"" + this.ClientID + "_preview\").style.display = 'block';}" + - "\nelse{document.getElementById(\"" + this.ClientID + "_preview\").style.display = 'none';}" + - "\n}"+ - "\nfunction " + this.ClientID + "_UpdateLink(retVal){" + - "\ndocument.getElementById(\"" + this.ClientID + "_thumbnaillink\").href = retVal;" + - "\n}"; - - try { - if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) - ScriptManager.RegisterClientScriptBlock(this, this.GetType(), this.ClientID + "_chooseId", strScript, true); + if (string.IsNullOrEmpty(ItemIdValue.Value)) + { + PreviewContainer.Style.Add(HtmlTextWriterStyle.Display, "none"); + ImgViewer.MediaId = -1; + } else - Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "_chooseId", strScript, true); - } - catch - { - Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "_chooseId", strScript, true); - } - // Clear remove link if text if empty - if (base.Value == "") - deleteLink = ""; - writer.WriteLine("" + tempTitle + "" + deleteLink + "" + ui.Text("choose") + "...   ");//   "); - - - - //Thumbnail preview - if (_showpreview) - { - string thumb = string.Empty; - string link = string.Empty; - string style = "display:none;"; - if (mediaId != -1) { - style = string.Empty; - thumb = string.Format(" src=\"{0}\" ", presentation.webservices.MediaPickerServiceHelpers.GetThumbNail(mediaId)); - link = string.Format(" href=\"{0}\" ", presentation.webservices.MediaPickerServiceHelpers.GetFile(mediaId)); + ImgViewer.MediaId = int.Parse(ItemIdValue.Value); } - - writer.WriteLine("
"); } - - - - - base.Render(writer); + + //if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) + //{ + // //renders the media picker JS class + // ScriptManager.RegisterStartupScript(this, this.GetType(), "MediaChooser", MediaChooserScripts.MediaPicker, true); + // ScriptManager.RegisterStartupScript(this, this.GetType(), this.ClientID + "MediaPicker", strScript, true); + + //} + //else + //{ + // //renders the media picker JS class + // Page.ClientScript.RegisterClientScriptBlock(typeof(mediaChooser), "MediaChooser", MediaChooserScripts.MediaPicker, true); + // Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "MediaPicker", strScript, true); + + //} + } - #endregion - } + + } } diff --git a/components/editorControls/pagepicker/pagePicker.cs b/components/editorControls/pagepicker/pagePicker.cs index 26c40dd49a..127575c27f 100644 --- a/components/editorControls/pagepicker/pagePicker.cs +++ b/components/editorControls/pagepicker/pagePicker.cs @@ -6,126 +6,37 @@ using ClientDependency.Core; using umbraco.presentation; using ClientDependency.Core.Controls; using umbraco.interfaces; +using System.Web.UI.WebControls; +using System.Web.UI.HtmlControls; +using umbraco.editorControls.pagepicker; +using umbraco.uicontrols.TreePicker; namespace umbraco.editorControls { /// /// Summary description for pagePicker. /// - [ClientDependency(100, ClientDependencyType.Css, "js/submodal/submodal.css", "UmbracoRoot")] - [ClientDependency(101, ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")] - //TODO: Work out how to include this: , InvokeJavascriptMethodOnLoad = "initPopUp" - [ClientDependency(102, ClientDependencyType.Javascript, "js/submodal/submodal.js", "UmbracoRoot")] [ValidationProperty("Value")] - public class pagePicker : System.Web.UI.WebControls.HiddenField, IDataEditor + public class pagePicker : BaseTreePickerEditor { - interfaces.IData _data; - public pagePicker(interfaces.IData Data) - { - _data = Data; - } - protected override void OnPreRender(EventArgs e) - { - base.OnPreRender(e); - Page.ClientScript.RegisterStartupScript(typeof(IDataEditor), "initPopUp", "jQuery(document).ready(function() { initPopUp(); } );", true); - } - #region IDataField Members - - //private string _text; - - - public System.Web.UI.Control Editor { get { return this; } } - - public virtual bool TreatAsRichTextEditor - { - get { return false; } - } - public bool ShowLabel + public pagePicker() : base() { } + public pagePicker(interfaces.IData data) : base(data) { } + + public override string TreePickerUrl { get { - return true; + return TreeService.GetPickerUrl("content", "content"); } } - public void Save() + public override string ModalWindowTitle { - //_text = helper.Request(this.ClientID); - if (base.Value.Trim() != "") - _data.Value = base.Value.Trim(); - else - _data.Value = null; - } - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - - // We need to make sure we have a reference to the legacy ajax calls in the scriptmanager - if (!UmbracoContext.Current.LiveEditingContext.Enabled) - presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page); - else - ClientDependencyLoader.Instance.RegisterDependency("webservices/legacyAjaxCalls.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); - - if (_data != null && _data.Value != null) - base.Value = _data.Value.ToString(); - } - - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - - string tempTitle = ""; - string deleteLink = "   " + ui.Text("delete") + "   "; - try + get { - if (base.Value.Trim() != "") - { - tempTitle = new cms.businesslogic.CMSNode(int.Parse(base.Value.Trim())).Text; - } + return ui.GetText("general", "choose") + " " + ui.GetText("sections", "content"); } - catch { } - - string strScript = "function " + this.ClientID + "_chooseId() {" + - "\nshowPopWin('" + TreeService.GetPickerUrl(true, "content", "content") + "', 300, 400, " + ClientID + "_saveId);" + - //"\nvar treePicker = window.showModalDialog(, 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no') " + - "\n}" + - "\nfunction " + ClientID + "_saveId(treePicker) {" + - "\nsetTimeout('" + ClientID + "_saveIdDo(' + treePicker + ')', 200);" + - "\n}" + - "\nfunction " + ClientID + "_saveIdDo(treePicker) {" + - "\nif (treePicker != undefined) {" + - "\ndocument.getElementById(\"" + this.ClientID + "\").value = treePicker;" + - "\nif (treePicker > 0) {" + - "\numbraco.presentation.webservices.legacyAjaxCalls.GetNodeName(treePicker, " + this.ClientID + "_updateContentTitle" + ");" + - "\n} " + - "\n}" + - "\n} " + - "\nfunction " + this.ClientID + "_updateContentTitle(retVal) {" + - "\ndocument.getElementById(\"" + this.ClientID + "_title\").innerHTML = \"\" + retVal + \"" + deleteLink.Replace("\"", "\\\"") + "\";" + - "\n}" + - "\nfunction " + this.ClientID + "_clear() {" + - "\ndocument.getElementById(\"" + this.ClientID + "_title\").innerHTML = \"\";" + - "\ndocument.getElementById(\"" + this.ClientID + "\").value = \"\";" + - "\n}"; - - try - { - if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) - ScriptManager.RegisterClientScriptBlock(this, this.GetType(), this.ClientID + "_chooseId", strScript, true); - else - Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "_chooseId", strScript, true); - } - catch - { - Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "_chooseId", strScript, true); - } - // Clear remove link if text if empty - if (base.Value.Trim() == "") - deleteLink = ""; - writer.WriteLine("" + tempTitle + "" + deleteLink + "" + ui.Text("choose") + "...   ");//"); - base.Render(writer); } - #endregion + } } diff --git a/components/editorControls/umbraco.editorControls.csproj b/components/editorControls/umbraco.editorControls.csproj index 9d8a873412..6b6147d6c2 100644 --- a/components/editorControls/umbraco.editorControls.csproj +++ b/components/editorControls/umbraco.editorControls.csproj @@ -152,9 +152,8 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - umbraco.presentation {651E1350-91B6-44B7-BD60-7207006D7003} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + umbraco.presentation {6EDD2061-82F2-461B-BB6E-879245A832DE} @@ -168,6 +167,7 @@ Code + Code @@ -256,6 +256,11 @@ Code + + MediaChooserScripts.resx + True + True + Code @@ -350,6 +355,11 @@ Designer + + Designer + ResXFileCodeGenerator + MediaChooserScripts.Designer.cs + textFieldDataEditor.cs Designer @@ -372,6 +382,9 @@ false + + + diff --git a/components/macroRenderings/content.cs b/components/macroRenderings/content.cs index 6131d8353b..6f2833b02f 100644 --- a/components/macroRenderings/content.cs +++ b/components/macroRenderings/content.cs @@ -5,111 +5,35 @@ using System.Data.SqlClient; using System.Web.UI; using ClientDependency.Core; using umbraco.IO; +using umbraco.interfaces; +using umbraco.uicontrols.TreePicker; namespace umbraco.macroRenderings { - /// - /// Summary description for content. - /// - [ClientDependency(103, ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")] - [ClientDependency(104, ClientDependencyType.Javascript, "js/submodal/subModal.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Css, "js/submodal/subModal.css", "UmbracoRoot")] - public class content : System.Web.UI.WebControls.WebControl, interfaces.IMacroGuiRendering + + public class content : SimpleContentPicker, IMacroGuiRendering { - private string m_value = ""; - public bool ShowCaption - { - get {return true;} - } + #region IMacroGuiRendering Members - public string Value - { - get { - if (Page.IsPostBack && !String.IsNullOrEmpty(System.Web.HttpContext.Current.Request[this.ClientID])) { - m_value = System.Web.HttpContext.Current.Request[this.ClientID]; - } - return m_value; + string IMacroGuiRendering.Value + { + get + { + return Value; + } + set + { + Value = value; } - set { m_value = value; } - } - - protected override void OnInit(EventArgs e) { - base.OnInit(e); - - // We need to make sure we have a reference to the legacy ajax calls in the scriptmanager - ScriptManager sm = ScriptManager.GetCurrent(Page); - ServiceReference legacyPath = new ServiceReference(SystemDirectories.Webservices + "/legacyAjaxCalls.asmx"); - if (!sm.Services.Contains(legacyPath)) - sm.Services.Add(legacyPath); } - public content() - { - // - // TODO: Add constructor logic here - // - } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) { - - string tempTitle = ""; - string deleteLink = "   " + ui.Text("delete") + "   "; - try { - if (this.Value != "") { - tempTitle = new cms.businesslogic.CMSNode(int.Parse(this.Value)).Text; - } - } catch { } - - writer.WriteLine(""); - - // Clear remove link if text if empty - if (this.Value == "") - deleteLink = ""; - writer.WriteLine("" + tempTitle + "" + deleteLink + "" + ui.Text("choose") + "...   "); - base.Render(writer); + bool IMacroGuiRendering.ShowCaption + { + get { return true; } } - - /* - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - string label = ""; - if (this.Value != "") - { - SqlDataReader pageName = SqlHelper.ExecuteReader(umbraco.GlobalSettings.DbDSN, - CommandType.Text, "select text as nodeName from umbracoNode where id = " + this.Value); - if (pageName.Read()) - label = pageName.GetString(pageName.GetOrdinal("nodeName")) + "
"; - pageName.Close(); - } - writer.WriteLine("" + label + ""); - - writer.WriteLine("Choose item"); - writer.WriteLine(""); - }*/ + #endregion } } diff --git a/components/macroRenderings/media.cs b/components/macroRenderings/media.cs index 33e2a94b96..71755121ff 100644 --- a/components/macroRenderings/media.cs +++ b/components/macroRenderings/media.cs @@ -6,112 +6,33 @@ using System.Data.SqlClient; using System.Web.UI; using ClientDependency.Core; using umbraco.IO; +using umbraco.interfaces; +using umbraco.uicontrols.TreePicker; namespace umbraco.macroRenderings { - /// - /// Summary description for media. - /// - [ClientDependency(103, ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")] - [ClientDependency(104, ClientDependencyType.Javascript, "js/submodal/subModal.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Css, "js/submodal/subModal.css", "UmbracoRoot")] - public class media : System.Web.UI.WebControls.WebControl, interfaces.IMacroGuiRendering + + public class media : SimpleMediaPicker, IMacroGuiRendering { - private string m_value = ""; + #region IMacroGuiRendering Members - public bool ShowCaption - { - get {return true;} - } - - public string Value { - get { - if (Page.IsPostBack && !String.IsNullOrEmpty(System.Web.HttpContext.Current.Request[this.ClientID])) { - m_value = System.Web.HttpContext.Current.Request[this.ClientID]; - } - return m_value; + string IMacroGuiRendering.Value + { + get + { + return Value; + } + set + { + Value = value; } - set { m_value = value; } } - public media() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) { - base.OnInit(e); - - - // We need to make sure we have a reference to the legacy ajax calls in the scriptmanager - ScriptManager sm = ScriptManager.GetCurrent(Page); - ServiceReference legacyPath = new ServiceReference(SystemDirectories.Webservices + "/legacyAjaxCalls.asmx"); - if (!sm.Services.Contains(legacyPath)) - sm.Services.Add(legacyPath); + bool IMacroGuiRendering.ShowCaption + { + get { return true; } } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) { - - string tempTitle = ""; - string deleteLink = "   " + ui.Text("delete") + "   "; - try { - if (this.Value != "") { - tempTitle = new cms.businesslogic.CMSNode(int.Parse(this.Value)).Text; - } - } catch { } - - writer.WriteLine(""); - - // Clear remove link if text if empty - if (this.Value == "") - deleteLink = ""; - writer.WriteLine("" + tempTitle + "" + deleteLink + "" + ui.Text("choose") + "...   "); - base.Render(writer); - } - - /* - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - string label = ""; - if (this.Value != "") - { - SqlDataReader pageName = SqlHelper.ExecuteReader(umbraco.GlobalSettings.DbDSN, - CommandType.Text, "select text as nodeName from umbracoNode where id = " + this.Value); - if (pageName.Read()) - label = pageName.GetString(pageName.GetOrdinal("nodeName")) + "
"; - pageName.Close(); - } - writer.WriteLine("" + label + ""); - - writer.WriteLine("Choose item"); - writer.WriteLine(""); - } - */ - - } + #endregion + } } diff --git a/components/macroRenderings/umbraco.macroRenderings.csproj b/components/macroRenderings/umbraco.macroRenderings.csproj index dfb6c914aa..5000b9e60b 100644 --- a/components/macroRenderings/umbraco.macroRenderings.csproj +++ b/components/macroRenderings/umbraco.macroRenderings.csproj @@ -124,6 +124,10 @@ {511F6D8D-7717-440A-9A57-A507E9A8B27F} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + {6EDD2061-82F2-461B-BB6E-879245A832DE} + umbraco.controls + diff --git a/components/umbraco.controls/CodeArea.cs b/components/umbraco.controls/CodeArea.cs index e517b6d836..d25121c83f 100644 --- a/components/umbraco.controls/CodeArea.cs +++ b/components/umbraco.controls/CodeArea.cs @@ -36,10 +36,12 @@ namespace umbraco.uicontrols { { get { + EnsureChildControls(); return CodeTextBox.Text; } set { + EnsureChildControls(); CodeTextBox.Text = value; } } diff --git a/components/umbraco.controls/TreePicker/BaseTreePicker.cs b/components/umbraco.controls/TreePicker/BaseTreePicker.cs new file mode 100644 index 0000000000..b1718d952a --- /dev/null +++ b/components/umbraco.controls/TreePicker/BaseTreePicker.cs @@ -0,0 +1,223 @@ +using System; +using System.Web.UI; +using ClientDependency.Core; +using ClientDependency.Core.Controls; +using umbraco.interfaces; +using System.Web.UI.WebControls; +using System.Web.UI.HtmlControls; +using umbraco.cms.businesslogic; +namespace umbraco.uicontrols.TreePicker +{ + + [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 + { + + protected HiddenField ItemIdValue; + protected HtmlAnchor DeleteLink; + protected HtmlAnchor ChooseLink; + protected HtmlGenericControl ItemTitle; + protected HtmlGenericControl ButtonContainer; + + public BaseTreePicker() + { + ShowDelete = true; + ModalHeight = 400; + ModalWidth = 300; + ShowHeader = true; + } + + /// + /// Wraps the hidden vield value + /// + public string Value + { + get + { + EnsureChildControls(); + return ItemIdValue.Value; + } + set + { + EnsureChildControls(); + ItemIdValue.Value = value; + } + } + + public int ModalWidth { get; set; } + public int ModalHeight { get; set; } + public bool ShowDelete { get; set; } + public bool ShowHeader { get; set; } + + /// + /// Need to specify the tree picker url (iframe) + /// + public abstract string TreePickerUrl { get; } + + /// + /// The title to specify for the picker window + /// + public abstract string ModalWindowTitle { get; } + + /// + /// If item has been selected or stored, this will query the db for it's title + /// + /// + protected virtual string GetItemTitle() + { + if (!string.IsNullOrEmpty(ItemIdValue.Value)) + { + try + { + return new CMSNode(int.Parse(ItemIdValue.Value)).Text; + } + catch (ArgumentException ex) { /*the node does not exist! we will ignore*/ } + } + return ""; + } + + /// + /// Outputs the JavaScript instances used to make this control work + /// + protected virtual string GetJSScript() + { + /* 0 = this control's client id + * 1 = label + * 2 = itemIdValueClientID + * 3 = itemTitleClientID + * 4 = itemPickerUrl + * 5 = popup width + * 6 = popup height + * 7 = show header + * 8 = umbraco path + */ + return string.Format(@" + var mc_{0} = new Umbraco.Controls.TreePicker('{0}','{1}','{2}','{3}','{4}',{5},{6},{7},'{8}');", + new string[] + { + this.ClientID, + ModalWindowTitle, + ItemIdValue.ClientID, + ItemTitle.ClientID, + TreePickerUrl, + ModalWidth.ToString(), + ModalHeight.ToString(), + ShowHeader.ToString().ToLower(), + umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco).TrimEnd('/') + }); + } + + /// + /// Registers the required JS classes required to make this control work + /// + protected virtual void RenderJSComponents() + { + if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) + { + ScriptManager.RegisterStartupScript(this, this.GetType(), this.GetType().ToString(), BaseTreePickerScripts.BaseTreePicker, true); + } + else + { + Page.ClientScript.RegisterClientScriptBlock(typeof(BaseTreePicker), this.GetType().ToString(), BaseTreePickerScripts.BaseTreePicker, true); + } + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + + EnsureChildControls(); + + //disable view state for this control + this.EnableViewState = false; + } + + /// + /// Create the native .net child controls for this control + /// + protected override void CreateChildControls() + { + base.CreateChildControls(); + + //create the hidden field + ItemIdValue = new HiddenField(); + ItemIdValue.ID = "ContentIdValue"; + this.Controls.Add(ItemIdValue); + + ButtonContainer = new HtmlGenericControl("span"); + ButtonContainer.ID = "btns"; + + //add item title with padding + ItemTitle = new HtmlGenericControl("span"); + ItemTitle.ID = "title"; + ItemTitle.Style.Add(HtmlTextWriterStyle.FontWeight, "bold"); + ButtonContainer.Controls.Add(ItemTitle); + ButtonContainer.Controls.Add(new LiteralControl(" ")); + ButtonContainer.Controls.Add(new LiteralControl(" ")); + + //add the delete link with padding + DeleteLink = new HtmlAnchor(); + DeleteLink.HRef = "#"; //set on pre-render + DeleteLink.Style.Add(HtmlTextWriterStyle.Color, "red"); + DeleteLink.Title = ui.GetText("delete"); + DeleteLink.InnerText = ui.GetText("delete"); + ButtonContainer.Controls.Add(DeleteLink); + ButtonContainer.Controls.Add(new LiteralControl(" ")); + ButtonContainer.Controls.Add(new LiteralControl(" ")); + if (!ShowDelete) + { + DeleteLink.Style.Add(HtmlTextWriterStyle.Display, "none"); + } + + this.Controls.Add(ButtonContainer); + + //add choose link with padding + ChooseLink = new HtmlAnchor(); + ChooseLink.HRef = "#"; //filled in on pre-render + ChooseLink.InnerText = ui.GetText("choose") + "..."; + this.Controls.Add(ChooseLink); + + } + + /// + /// Registers the JavaScript required for the control to function and hides/shows controls depending on it's properties + /// + /// + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + + //hide the buttons if no item, otherwise get the item title + if (string.IsNullOrEmpty(ItemIdValue.Value)) + { + ButtonContainer.Style.Add(HtmlTextWriterStyle.Display, "none"); + } + else + { + ItemTitle.InnerText = GetItemTitle(); + } + + ChooseLink.HRef = string.Format("javascript:mc_{0}.LaunchPicker();", this.ClientID); + DeleteLink.HRef = string.Format("javascript:mc_{0}.ClearSelection();", this.ClientID); + + RenderJSComponents(); + + if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack) + { + ScriptManager.RegisterStartupScript(this, this.GetType(), this.ClientID + "TreePicker", GetJSScript(), true); + } + else + { + Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "TreePicker", GetJSScript(), true); + } + + } + + + } +} diff --git a/components/umbraco.controls/TreePicker/BaseTreePicker.js b/components/umbraco.controls/TreePicker/BaseTreePicker.js new file mode 100644 index 0000000000..2992bfe471 --- /dev/null +++ b/components/umbraco.controls/TreePicker/BaseTreePicker.js @@ -0,0 +1,70 @@ +/// + +Umbraco.Sys.registerNamespace("Umbraco.Controls"); + +(function($) { + Umbraco.Controls.TreePicker = function(clientId, label, itemIdValueClientID, itemTitleClientID, itemPickerUrl, width, height, showHeader, umbracoPath) { + var obj = { + _itemPickerUrl: itemPickerUrl, + _webServiceUrl: umbracoPath + "/webservices/legacyAjaxCalls.asmx/GetNodeName", + _label: label, + _width: width, + _height: height, + _itemIdValueClientID: itemIdValueClientID, + _itemTitleClientID: itemTitleClientID, + _showHeader: showHeader, + _clientId: clientId, + + GetValue: function() { + return $("#" + this._itemIdValueClientID).val(); + }, + + LaunchPicker: function() { + var _this = this; + UmbClientMgr.openModalWindow(this._itemPickerUrl, this._label, this._showHeader, this._width, this._height, 30, 0, ['#cancelbutton'], function(e) { _this.SaveSelection(e); }); + }, + + SaveSelection: function(e) { + if (!e.outVal) { + return; + } + $("#" + this._itemIdValueClientID).val(e.outVal); + var _this = this; + $.ajax({ + type: "POST", + url: _this._webServiceUrl, + data: '{ "nodeId": ' + e.outVal + ' }', + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function(msg) { + $("#" + _this._itemTitleClientID).html(msg.d); + $("#" + _this._itemTitleClientID).parent().show(); + } + }); + }, + + ClearSelection: function() { + $("#" + this._itemTitleClientID).parent().hide(); + $("#" + this._itemIdValueClientID).val(''); + } + }; + + //store this instance (by counter and id) so we can retrieve it later if needed + Umbraco.Controls.TreePicker.inst[++Umbraco.Controls.TreePicker.cntr] = obj; + Umbraco.Controls.TreePicker.inst[clientId] = obj; + + return obj; + } + + // Static methods + + //return the existing picker object based on client id of the control + Umbraco.Controls.TreePicker.GetPickerById = function(id) { + return Umbraco.Controls.TreePicker.inst[id] || null; + }; + + // instance manager + Umbraco.Controls.TreePicker.cntr = 0; + Umbraco.Controls.TreePicker.inst = {}; + +})(jQuery); diff --git a/components/umbraco.controls/TreePicker/BaseTreePickerScripts.Designer.cs b/components/umbraco.controls/TreePicker/BaseTreePickerScripts.Designer.cs new file mode 100644 index 0000000000..75d186dfbc --- /dev/null +++ b/components/umbraco.controls/TreePicker/BaseTreePickerScripts.Designer.cs @@ -0,0 +1,83 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace umbraco.uicontrols.TreePicker { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class BaseTreePickerScripts { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal BaseTreePickerScripts() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("umbraco.uicontrols.TreePicker.BaseTreePickerScripts", typeof(BaseTreePickerScripts).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to /// <reference path="/umbraco_client/Application/NamespaceManager.js" /> + /// + ///Umbraco.Sys.registerNamespace("Umbraco.Controls"); + /// + ///(function($) { + /// Umbraco.Controls.TreePicker = function(label, itemIdValueClientID, itemTitleClientID, itemPickerUrl, width, height, showHeader, umbracoPath) { + /// return { + /// _itemPickerUrl: itemPickerUrl, + /// _webServiceUrl: umbracoPath + "/webservices/legacyAjaxCalls.asmx/GetNodeName", + /// _label: label, + /// _width: width, + /// [rest of string was truncated]";. + /// + internal static string BaseTreePicker { + get { + return ResourceManager.GetString("BaseTreePicker", resourceCulture); + } + } + } +} diff --git a/components/umbraco.controls/TreePicker/BaseTreePickerScripts.resx b/components/umbraco.controls/TreePicker/BaseTreePickerScripts.resx new file mode 100644 index 0000000000..628b40df7b --- /dev/null +++ b/components/umbraco.controls/TreePicker/BaseTreePickerScripts.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + BaseTreePicker.js;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + \ No newline at end of file diff --git a/components/umbraco.controls/TreePicker/SimpleContentPicker.cs b/components/umbraco.controls/TreePicker/SimpleContentPicker.cs new file mode 100644 index 0000000000..9866048294 --- /dev/null +++ b/components/umbraco.controls/TreePicker/SimpleContentPicker.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace umbraco.uicontrols.TreePicker +{ + public class SimpleContentPicker : BaseTreePicker + { + public override string TreePickerUrl + { + get + { + return TreeUrlGenerator.GetPickerUrl("content", "content"); + } + } + + public override string ModalWindowTitle + { + get + { + return ui.GetText("general", "choose") + " " + ui.GetText("sections", "content"); + } + } + } +} diff --git a/components/umbraco.controls/TreePicker/SimpleMediaPicker.cs b/components/umbraco.controls/TreePicker/SimpleMediaPicker.cs new file mode 100644 index 0000000000..d91ca6cbba --- /dev/null +++ b/components/umbraco.controls/TreePicker/SimpleMediaPicker.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace umbraco.uicontrols.TreePicker +{ + public class SimpleMediaPicker : BaseTreePicker + { + public override string TreePickerUrl + { + get + { + return TreeUrlGenerator.GetPickerUrl("media", "media"); + } + } + + public override string ModalWindowTitle + { + get + { + return ui.GetText("general", "choose") + " " + ui.GetText("sections", "media"); + } + } + } +} diff --git a/components/umbraco.controls/TreeUrlGenerator.cs b/components/umbraco.controls/TreeUrlGenerator.cs new file mode 100644 index 0000000000..a136772028 --- /dev/null +++ b/components/umbraco.controls/TreeUrlGenerator.cs @@ -0,0 +1,202 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace umbraco.uicontrols +{ + /// + /// This class will generate the URLs for iframe tree pages. + /// Generally used to get the a tree picker url. + /// + /// + /// This was created in 4.1 so that this helper class can be exposed to other assemblies since + /// it only existed in the presentation assembly in previous versions + /// + public class TreeUrlGenerator + { + + public const string TREE_URL = "tree.aspx"; + public const string INIT_URL = "treeinit.aspx"; + public const string PICKER_URL = "treepicker.aspx"; + + private int? m_startNodeID; + private string m_treeType; + private bool? m_showContextMenu; + private bool? m_isDialog; + private string m_app; + private string m_nodeKey; + private string m_functionToCall; + + #region Public Properties + + public string FunctionToCall + { + get { return m_functionToCall; } + set { m_functionToCall = value; } + } + + public string NodeKey + { + get { return m_nodeKey; } + set { m_nodeKey = value; } + } + + public int StartNodeID + { + get { return m_startNodeID ?? -1; } + set { m_startNodeID = value; } + } + + public string TreeType + { + get { return m_treeType; } + set { m_treeType = value; } + } + + public bool ShowContextMenu + { + get { return m_showContextMenu ?? true; } + set { m_showContextMenu = value; } + } + + public bool IsDialog + { + get { return m_isDialog ?? false; } + set { m_isDialog = value; } + } + + public string App + { + get { return m_app; } + set { m_app = value; } + } + #endregion + + /// + /// Returns the url for servicing the xml tree request based on the parameters specified on this class. + /// + /// Tree service url as a string + public string GetServiceUrl() + { + return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/" + GetUrl(TREE_URL); + } + + /// + /// Static method to return the tree service url with the specified parameters + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static string GetServiceUrl(int? startNodeID, string treeType, bool? showContextMenu, + bool? isDialog, string app, string nodeKey, string functionToCall) + { + TreeUrlGenerator treeSvc = new TreeUrlGenerator() + { + StartNodeID = startNodeID ?? -1, + TreeType = treeType, + ShowContextMenu = showContextMenu ?? true, + IsDialog = isDialog ?? false, + App = app, + NodeKey = nodeKey, + FunctionToCall = functionToCall + }; + return treeSvc.GetServiceUrl(); + } + + /// + /// Returns the url for initializing the tree based on the parameters specified on this class + /// + /// + public string GetInitUrl() + { + return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/" + GetUrl(INIT_URL); + } + + /// + /// static method to return the tree init url with the specified parameters + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static string GetInitUrl(int? startNodeID, string treeType, bool? showContextMenu, + bool? isDialog, string app, string nodeKey, string functionToCall) + { + TreeUrlGenerator treeSvc = new TreeUrlGenerator() + { + StartNodeID = startNodeID ?? -1, + TreeType = treeType, + ShowContextMenu = showContextMenu ?? true, + IsDialog = isDialog ?? false, + App = app, + NodeKey = nodeKey, + FunctionToCall = functionToCall + }; + return treeSvc.GetInitUrl(); + } + + /// + /// Returns the url for the tree picker (used on modal windows) based on the parameters specified on this class + /// + public static string GetPickerUrl(string app, string treeType) + { + TreeUrlGenerator treeSvc = new TreeUrlGenerator(); + treeSvc.App = app; + treeSvc.TreeType = treeType; + return treeSvc.GetPickerUrl(); + } + + /// + /// Returns the url for the tree picker (used on modal windows) based on the parameters specified on this class + /// + public string GetPickerUrl() + { + return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/" + GetUrl(PICKER_URL); + } + + [Obsolete("No longer used as useSubModal no longer has any relavence")] + public static string GetPickerUrl(bool useSubModal, string app, string treeType) + { + return GetPickerUrl(app, treeType); + } + [Obsolete("No longer used as useSubModal no longer has any relavence")] + public string GetPickerUrl(bool useSubModal) + { + return GetPickerUrl(); + } + + /// + /// Generates the URL parameters for the tree service. + /// + /// the base url (i.e. tree.aspx) + /// + protected virtual string GetUrl(string pageUrl) + { + StringBuilder sb = new StringBuilder(); + + sb.Append(pageUrl); + //insert random + sb.Append(string.Format("?rnd={0}", Guid.NewGuid().ToString("N"))); + + sb.Append(string.Format("&id={0}", this.StartNodeID.ToString())); + if (!string.IsNullOrEmpty(this.TreeType)) sb.Append(string.Format("&treeType={0}", this.TreeType)); + if (!string.IsNullOrEmpty(this.NodeKey)) sb.Append(string.Format("&nodeKey={0}", this.NodeKey)); + sb.Append(string.Format("&contextMenu={0}", this.ShowContextMenu.ToString().ToLower())); + sb.Append(string.Format("&isDialog={0}", this.IsDialog.ToString().ToLower())); + if (!string.IsNullOrEmpty(this.App)) sb.Append(string.Format("&app={0}", this.App)); + + return sb.ToString(); + } + + } +} diff --git a/components/umbraco.controls/feedback.cs b/components/umbraco.controls/feedback.cs index eb38cd9914..9e3c1b2c24 100644 --- a/components/umbraco.controls/feedback.cs +++ b/components/umbraco.controls/feedback.cs @@ -45,7 +45,7 @@ namespace umbraco.uicontrols { styleString += key + ":" + this.Style[key] + ";"; } - writer.WriteLine("

"); + writer.WriteLine("

"); writer.WriteLine(_text); writer.WriteLine("

"); } diff --git a/components/umbraco.controls/umbraco.controls.csproj b/components/umbraco.controls/umbraco.controls.csproj index 775f15db1b..6aa427313d 100644 --- a/components/umbraco.controls/umbraco.controls.csproj +++ b/components/umbraco.controls/umbraco.controls.csproj @@ -7,7 +7,7 @@ {6EDD2061-82F2-461B-BB6E-879245A832DE} Library Properties - umbraco.controls + umbraco.uicontrols controls SAK SAK @@ -64,6 +64,15 @@ + + + True + True + BaseTreePickerScripts.resx + + + + @@ -86,6 +95,23 @@ {E469A9CE-1BEC-423F-AC44-713CD72457EA} umbraco.businesslogic + + {CCD75EC3-63DB-4184-B49D-51C1DD337230} + umbraco.cms + + + {511F6D8D-7717-440A-9A57-A507E9A8B27F} + umbraco.interfaces + + + + + + + + ResXFileCodeGenerator + BaseTreePickerScripts.Designer.cs + - \ No newline at end of file + diff --git a/foreign dlls/ClientDependency.Core.dll b/foreign dlls/ClientDependency.Core.dll index eae13120f3c3e97b492d75e717b7516eab39a0da..d02843e2cc5abc16c17db19967360fbf782eac36 100644 GIT binary patch literal 54784 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

cDMmJ9K=;Um6!*%CowbsSL8waLXQ@I_A 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 diff --git a/foreign dlls/UmbracoExamine.Core.dll b/foreign dlls/UmbracoExamine.Core.dll index 5daf59a208cef4ac6543ee81fcefe468a1151ed9..a76d093f7512858bd5d8181101bc38a1fc393214 100644 GIT binary patch literal 30208 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 A6aWAK literal 27648 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 diff --git a/foreign dlls/UmbracoExamine.Providers.dll b/foreign dlls/UmbracoExamine.Providers.dll index e48efd8f90399f7b13cf043f339c5457cafcff49..48877c8ab7d33fa65caf6e3feb04bd6113ba02d9 100644 GIT binary patch literal 41472 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 diff --git a/umbraco/businesslogic/Application.cs b/umbraco/businesslogic/Application.cs index c60b75efa8..82817ee774 100644 --- a/umbraco/businesslogic/Application.cs +++ b/umbraco/businesslogic/Application.cs @@ -211,7 +211,7 @@ namespace umbraco.BusinessLogic { if (GlobalSettings.Configured) { - List types = TypeFinder.FindClassesOfType(false); + List types = TypeFinder.FindClassesOfType(); foreach (Type t in types) { try diff --git a/umbraco/businesslogic/BasePages/ClientTools.cs b/umbraco/businesslogic/BasePages/ClientTools.cs index 9ba543ae8c..ca36941b77 100644 --- a/umbraco/businesslogic/BasePages/ClientTools.cs +++ b/umbraco/businesslogic/BasePages/ClientTools.cs @@ -54,11 +54,23 @@ namespace umbraco.BasePages public static string MoveNode { get { return GetMainTree + ".moveNode('{0}', '{1}');"; } } public static string ReloadActionNode { get { return GetMainTree + ".reloadActionNode({0}, {1}, null);"; } } public static string SetActiveTreeType { get { return GetMainTree + ".setActiveTreeType('{0}');"; } } - public static string CloseModalWindow { get { return GetMainWindow + ".closeModal();"; } } - public static string OpenModalWindow(string url, string name, int height, int width) - { - return string.Format(GetMainWindow + ".openModal('{0}','{1}',{2},{3});", url, name, height, width); - } + public static string CloseModalWindow() + { + return string.Format("{0}.closeModalWindow();", ClientMgrScript); + } + public static string CloseModalWindow(string rVal) + { + return string.Format("{0}.closeModalWindow('{1}');", ClientMgrScript, rVal); + } + public static string OpenModalWindow(string url, string name, int width, int height) + { + return OpenModalWindow(url, name, true, width, height, 0, 0, "", ""); + } + public static string OpenModalWindow(string url, string name, bool showHeader, int width, int height, int top, int leftOffset, string closeTriggers, string onCloseCallback) + { + return string.Format("{0}.openModalWindow('{1}', '{2}', {3}, {4}, {5}, {6}, {7}, '{8}', '{9}');", + new object[] { ClientMgrScript, url, name, showHeader.ToString().ToLower(), width, height, top, leftOffset, closeTriggers, onCloseCallback }); + } } private Page m_page; @@ -238,14 +250,25 @@ namespace umbraco.BasePages } ///

- /// Closes the Umbraco dialog window if it is open + /// Closes the Umbraco dialog window if it is open /// - public ClientTools CloseModalWindow() + /// specify a value to return to add to the onCloseCallback method if one was specified in the OpenModalWindow method + /// + public ClientTools CloseModalWindow(string returnVal) { - RegisterClientScript(Scripts.CloseModalWindow); + RegisterClientScript(Scripts.CloseModalWindow(returnVal)); return this; } - + /// + /// Closes the umbraco dialog window if it is open + /// + /// + public ClientTools CloseModalWindow() + { + return CloseModalWindow(""); + } + + /// /// Opens a modal window /// @@ -254,13 +277,11 @@ namespace umbraco.BasePages /// /// /// - public ClientTools OpenModalWindow(string url, string name, int height, int width) + public ClientTools OpenModalWindow(string url, string name, bool showHeader, int width, int height, int top, int leftOffset, string closeTriggers, string onCloseCallback) { - RegisterClientScript(Scripts.OpenModalWindow(url, name, height, width)); + RegisterClientScript(Scripts.OpenModalWindow(url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback)); return this; } - - private Page GetCurrentPage() { diff --git a/umbraco/businesslogic/Utils/TypeFinder.cs b/umbraco/businesslogic/Utils/TypeFinder.cs index 68987c63cf..935ffc9577 100644 --- a/umbraco/businesslogic/Utils/TypeFinder.cs +++ b/umbraco/businesslogic/Utils/TypeFinder.cs @@ -14,13 +14,37 @@ namespace umbraco.BusinessLogic.Utils public static class TypeFinder { - /// + + + /// + /// Searches all loaded assemblies for classes of the type passed in. + /// + /// The type of object to search for + /// A list of found types + public static List FindClassesOfType() + { + return FindClassesOfType(true); + } + + /// + /// Searches all loaded assemblies for classes of the type passed in. + /// + /// The type of object to search for + /// true if a seperate app domain should be used to query the types. This is safer as it is able to clear memory after loading the types. + /// A list of found types + public static List FindClassesOfType(bool useSeperateAppDomain) + { + return FindClassesOfType(useSeperateAppDomain, true); + } + + /// /// Searches all loaded assemblies for classes of the type passed in. /// /// The type of object to search for /// true if a seperate app domain should be used to query the types. This is safer as it is able to clear memory after loading the types. + /// True to only return classes that can be constructed /// A list of found types - public static List FindClassesOfType(bool useSeperateAppDomain) + public static List FindClassesOfType(bool useSeperateAppDomain, bool onlyConcreteClasses) { if (useSeperateAppDomain) { @@ -32,10 +56,10 @@ namespace umbraco.BusinessLogic.Utils foreach (string type in strTypes) types.Add(Type.GetType(type)); - return types; + return types.FindAll(OnlyConcreteClasses(typeof(T), onlyConcreteClasses)); } else - return FindClassesOfType(typeof(T)); + return FindClassesOfType(typeof(T), onlyConcreteClasses); } /// @@ -43,7 +67,7 @@ namespace umbraco.BusinessLogic.Utils /// /// The type. /// A list of found classes - private static List FindClassesOfType(Type type) + private static List FindClassesOfType(Type type, bool onlyConcreteClasses) { bool searchGAC = false; @@ -65,9 +89,7 @@ namespace umbraco.BusinessLogic.Utils List listOfTypes = new List(); listOfTypes.AddRange(publicTypes); - List foundTypes = listOfTypes.FindAll( - delegate(Type t) { return (type.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract); } - ); + List foundTypes = listOfTypes.FindAll(OnlyConcreteClasses(type, onlyConcreteClasses)); Type[] outputTypes = new Type[foundTypes.Count]; foundTypes.CopyTo(outputTypes); classesOfType.AddRange(outputTypes); @@ -76,5 +98,10 @@ namespace umbraco.BusinessLogic.Utils return classesOfType; } + private static Predicate OnlyConcreteClasses(Type type, bool onlyConcreteClasses) + { + return t => (type.IsAssignableFrom(t) && (onlyConcreteClasses ? (t.IsClass && !t.IsAbstract) : true)); + } + } } diff --git a/umbraco/cms/Actions/Action.cs b/umbraco/cms/Actions/Action.cs index 55a8e77068..8e558159ca 100644 --- a/umbraco/cms/Actions/Action.cs +++ b/umbraco/cms/Actions/Action.cs @@ -45,7 +45,7 @@ namespace umbraco.BusinessLogic.Actions if (_actionHandlers.Count > 0) return; - List foundIActionHandlers = TypeFinder.FindClassesOfType(true); + List foundIActionHandlers = TypeFinder.FindClassesOfType(); foreach (Type type in foundIActionHandlers) { IActionHandler typeInstance; @@ -63,7 +63,7 @@ namespace umbraco.BusinessLogic.Actions if (_actions.Count > 0) return; - List foundIActions = TypeFinder.FindClassesOfType(true); + List foundIActions = TypeFinder.FindClassesOfType(); foreach (Type type in foundIActions) { IAction typeInstance; diff --git a/umbraco/cms/businesslogic/Packager/PackageInstance/PackageActions.cs b/umbraco/cms/businesslogic/Packager/PackageInstance/PackageActions.cs index 1b93dae4be..3e7963a290 100644 --- a/umbraco/cms/businesslogic/Packager/PackageInstance/PackageActions.cs +++ b/umbraco/cms/businesslogic/Packager/PackageInstance/PackageActions.cs @@ -28,7 +28,7 @@ namespace umbraco.cms.businesslogic.packager { private static void RegisterPackageActions() { - List types = TypeFinder.FindClassesOfType(true); + List types = TypeFinder.FindClassesOfType(); foreach (Type t in types) { IPackageAction typeInstance = Activator.CreateInstance(t) as IPackageAction; diff --git a/umbraco/cms/businesslogic/datatype/factory.cs b/umbraco/cms/businesslogic/datatype/factory.cs index b3e5b3dc0f..9637b2d40a 100644 --- a/umbraco/cms/businesslogic/datatype/factory.cs +++ b/umbraco/cms/businesslogic/datatype/factory.cs @@ -72,7 +72,7 @@ namespace umbraco.cms.businesslogic.datatype.controls private static void Initialize() { // Get all datatypes from interface - List types = TypeFinder.FindClassesOfType(true); + List types = TypeFinder.FindClassesOfType(); getDataTypes(types); } diff --git a/umbraco/cms/umbraco.cms.csproj b/umbraco/cms/umbraco.cms.csproj index 44d6cff307..28957121cd 100644 --- a/umbraco/cms/umbraco.cms.csproj +++ b/umbraco/cms/umbraco.cms.csproj @@ -118,10 +118,6 @@ False ..\..\foreign dlls\TidyNet.dll - - {6EDD2061-82F2-461B-BB6E-879245A832DE} - umbraco.controls - umbraco.businesslogic {E469A9CE-1BEC-423F-AC44-713CD72457EA} diff --git a/umbraco/interfaces/IDataEditor.cs b/umbraco/interfaces/IDataEditor.cs index caa44acbe0..abb4273cf6 100644 --- a/umbraco/interfaces/IDataEditor.cs +++ b/umbraco/interfaces/IDataEditor.cs @@ -31,16 +31,4 @@ namespace umbraco.interfaces /// The editor. System.Web.UI.Control Editor{get;} } - - /// - /// The alternative Data Editor which supports AJAX - /// - public interface IDataEditorAjaxAlternative - { - /// - /// Gets the ajax editor. - /// - /// The ajax editor. - System.Web.UI.Control AjaxEditor { get;} - } } diff --git a/umbraco/interfaces/IDataEditorAjaxAlternative.cs b/umbraco/interfaces/IDataEditorAjaxAlternative.cs new file mode 100644 index 0000000000..c96e5478a2 --- /dev/null +++ b/umbraco/interfaces/IDataEditorAjaxAlternative.cs @@ -0,0 +1,16 @@ +using System; + +namespace umbraco.interfaces +{ + /// + /// The alternative Data Editor which supports AJAX + /// + public interface IDataEditorAjaxAlternative + { + /// + /// Gets the ajax editor. + /// + /// The ajax editor. + System.Web.UI.Control AjaxEditor { get; } + } +} diff --git a/umbraco/interfaces/umbraco.interfaces.csproj b/umbraco/interfaces/umbraco.interfaces.csproj index 4c58994525..71d1192026 100644 --- a/umbraco/interfaces/umbraco.interfaces.csproj +++ b/umbraco/interfaces/umbraco.interfaces.csproj @@ -112,6 +112,7 @@ Code + Code diff --git a/umbraco/presentation/config/ExamineIndex.config b/umbraco/presentation/config/ExamineIndex.config index b29e5f812a..03ae727340 100644 --- a/umbraco/presentation/config/ExamineIndex.config +++ b/umbraco/presentation/config/ExamineIndex.config @@ -23,8 +23,8 @@ More information and documentation can be found on CodePlex: http://umbracoexami - \ No newline at end of file diff --git a/umbraco/presentation/config/ExamineSettings.config b/umbraco/presentation/config/ExamineSettings.config index 5fe6e6756a..5831d191d6 100644 --- a/umbraco/presentation/config/ExamineSettings.config +++ b/umbraco/presentation/config/ExamineSettings.config @@ -5,7 +5,7 @@ This configuration file can be extended to add your own search/index providers. Index sets can be defined in the ExamineIndex.config if you're using the standard provider model. More information and documentation can be found on CodePlex: http://umbracoexamine.codeplex.com ---> +--> @@ -14,6 +14,12 @@ More information and documentation can be found on CodePlex: http://umbracoexami enabled="true" debug="false" supportUnpublished="true"/> + diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx index b6fc96430d..0e195d932c 100644 --- a/umbraco/presentation/install/default.aspx +++ b/umbraco/presentation/install/default.aspx @@ -48,7 +48,7 @@ } function openDemoModal(id, name) { - openModal("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, name, 550, 750) + UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, name, true, 750, 550) return false; } @@ -62,8 +62,9 @@ - - + + +
diff --git a/umbraco/presentation/install/default.aspx.designer.cs b/umbraco/presentation/install/default.aspx.designer.cs index 8be2aefc2a..c4422e301f 100644 --- a/umbraco/presentation/install/default.aspx.designer.cs +++ b/umbraco/presentation/install/default.aspx.designer.cs @@ -49,6 +49,15 @@ namespace umbraco.presentation.install { /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude4; + /// + /// JsInclude3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude3; + /// /// JsInclude1 control. /// diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index dd6adbafa9..d22dc84458 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -140,7 +140,7 @@ 3.5 - + System.Web.Services @@ -425,6 +425,24 @@ + + ImageViewer.ascx + ASPXCodeBehind + + + ImageViewer.ascx + + + ImageViewerUpdater.asmx + Component + + + UploadMediaImage.ascx + ASPXCodeBehind + + + UploadMediaImage.ascx + ContentTypeControlNew.ascx ASPXCodeBehind @@ -457,17 +475,19 @@ passwordChanger.ascx - ProgressBar.ascx ASPXCodeBehind + ProgressBar.ascx ProgressBar.ascx - + + + TreeControl.ascx ASPXCodeBehind - + TreeControl.ascx @@ -1187,16 +1207,15 @@ + + Code + + MacroContainerService.asmx Component - - MediaPickerService.asmx - Component - - TreeClientService.asmx Component @@ -1442,24 +1461,35 @@ + + + - - - - + + + + + + + + + + + + @@ -1531,7 +1561,6 @@ - @@ -1933,10 +1962,6 @@ - - - - @@ -2686,7 +2711,6 @@ - @@ -2752,7 +2776,6 @@ umbraco.xsd - diff --git a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs index 05764a1069..6a639bc15b 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs @@ -17,14 +17,14 @@ 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(2, ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient")] - //[ClientDependency(3, ClientDependencyType.Javascript, "Application/UmbracoClientManager.js", "UmbracoClient")] - //[ClientDependency(3, ClientDependencyType.Javascript, "js/language.aspx", "UmbracoRoot")] - + [ClientDependency(0, ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient")] [ClientDependency(1, ClientDependencyType.Css, "LiveEditing/CSS/LiveEditing.css", "UmbracoRoot")] - [ClientDependency(1, ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", InvokeJavascriptMethodOnLoad = "jQuery.noConflict")] - [ClientDependency(2, ClientDependencyType.Javascript, "js/UmbracoSpeechBubble.js", "UmbracoRoot", InvokeJavascriptMethodOnLoad = "InitUmbracoSpeechBubble")] + [ClientDependency(1, ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient")] + [ClientDependency(2, ClientDependencyType.Javascript, "Application/JQuery/jquery.noconflict-invoke.js", "UmbracoClient")] + [ClientDependency(3, ClientDependencyType.Javascript, "js/UmbracoSpeechBubble.js", "UmbracoRoot")] + [ClientDependency(4, ClientDependencyType.Javascript, "js/UmbracoSpeechBubbleInit.js", "UmbracoRoot")] + [ClientDependency(10, ClientDependencyType.Javascript, "Application/UmbracoUtils.js", "UmbracoClient")] + [ClientDependency(20, ClientDependencyType.Javascript, "Application/UmbracoClientManager.js", "UmbracoClient")] public class LiveEditingManager : Control { diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs index 56335a66a6..9cfa7ee286 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs @@ -1,7 +1,7 @@ using System; using System.Web.UI; using System.Web.UI.WebControls; -using AjaxControlToolkit; +//using AjaxControlToolkit; using umbraco.cms.businesslogic.web; using umbraco.presentation.LiveEditing.Controls; using Content = umbraco.cms.businesslogic.Content; @@ -18,7 +18,7 @@ namespace umbraco.presentation.LiveEditing.Modules.CreateModule protected ImageButton m_CreateButton = new ImageButton(); protected Panel m_CreateModal = new Panel(); - protected ModalPopupExtender m_CreateModalExtender = new ModalPopupExtender(); + //protected ModalPopupExtender m_CreateModalExtender = new ModalPopupExtender(); protected TextBox m_NameTextBox = new TextBox(); protected DropDownList m_AllowedDocTypesDropdown = new DropDownList(); @@ -75,14 +75,14 @@ namespace umbraco.presentation.LiveEditing.Modules.CreateModule m_CancelCreateButton.Text = "Cancel"; m_CancelCreateButton.CssClass = "modalbuton"; - Controls.Add(m_CreateModalExtender); - m_CreateModalExtender.ID = "ModalCreate"; - m_CreateModalExtender.TargetControlID = m_CreateButton.ID; - m_CreateModalExtender.PopupControlID = m_CreateModal.ID; - m_CreateModalExtender.BackgroundCssClass = "modalBackground"; - m_CreateModalExtender.OkControlID = m_ConfirmCreateButton.ID; - m_CreateModalExtender.CancelControlID = m_CancelCreateButton.ID; - m_CreateModalExtender.OnOkScript = string.Format("CreateModuleOk()"); + //Controls.Add(m_CreateModalExtender); + //m_CreateModalExtender.ID = "ModalCreate"; + //m_CreateModalExtender.TargetControlID = m_CreateButton.ID; + //m_CreateModalExtender.PopupControlID = m_CreateModal.ID; + //m_CreateModalExtender.BackgroundCssClass = "modalBackground"; + //m_CreateModalExtender.OkControlID = m_ConfirmCreateButton.ID; + //m_CreateModalExtender.CancelControlID = m_CancelCreateButton.ID; + //m_CreateModalExtender.OnOkScript = string.Format("CreateModuleOk()"); m_CreateModal.Controls.Add(new LiteralControl("
")); diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs index 9f0d2ab965..3ab539ed5b 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs @@ -21,8 +21,9 @@ namespace umbraco.presentation.LiveEditing.Modules.ItemEditing /// Control that wraps the editor control to edit a field in Live Editing mode. /// [ClientDependency(1, ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient")] - [ClientDependency(21, ClientDependencyType.Javascript, "LiveEditing/Modules/ItemEditing/ItemEditing.js", "UmbracoRoot", InvokeJavascriptMethodOnLoad = "initializeGlobalItemEditing")] - [ClientDependency(21, ClientDependencyType.Javascript, "tinymce3/tiny_mce_src.js", "UmbracoClient")] //For TinyMCE to work in LiveEdit, we need to ensure that this script is run before it loads... + [ClientDependency(21, ClientDependencyType.Javascript, "LiveEditing/Modules/ItemEditing/ItemEditing.js", "UmbracoRoot")] + [ClientDependency(22, ClientDependencyType.Javascript, "LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js", "UmbracoRoot")] + [ClientDependency(23, ClientDependencyType.Javascript, "tinymce3/tiny_mce_src.js", "UmbracoClient")] //For TinyMCE to work in LiveEdit, we need to ensure that this script is run before it loads... public class ItemEditor : UpdatePanel { #region Protected Constants diff --git a/umbraco/presentation/umbraco/Trees/BaseContentTree.cs b/umbraco/presentation/umbraco/Trees/BaseContentTree.cs index 43b696eff0..7c31331c32 100644 --- a/umbraco/presentation/umbraco/Trees/BaseContentTree.cs +++ b/umbraco/presentation/umbraco/Trees/BaseContentTree.cs @@ -58,7 +58,7 @@ namespace umbraco.cms.presentation.Trees if (!String.IsNullOrEmpty(this.FunctionToCall)) { Javascript.Append("function openContent(id) {\n"); - Javascript.Append(this.FunctionToCall + "(id)\n"); + Javascript.Append(this.FunctionToCall + "(id);\n"); Javascript.Append("}\n"); } else if (!this.IsDialog) @@ -70,20 +70,20 @@ function openContent(id) { } "); } - else - { - //TODO: SD: Find out how what this does...? - Javascript.Append( - @" -function openContent(id) { - if (parent.opener) - parent.opener.dialogHandler(id); - else - parent.dialogHandler(id); -} - -"); - } + //TODO: SD: UPDATE ALL TREE CODE SO THAT THE FUNCTIONTOCALL IS EXPLICITLY SET WHEN DIALOGHANDLER IS REQUIRED! + // else +// { +// Javascript.Append( +// @" +//function openContent(id) { +// if (parent.opener) +// parent.opener.dialogHandler(id); +// else +// parent.dialogHandler(id); +//} +// +//"); +// } } @@ -214,14 +214,14 @@ function openContent(id) { } protected void SetActionAttribute(ref XmlTreeNode treeElement, Document dd) { - //TODO: Work out why the DialogMode isn't working + // Check for dialog behaviour - if (this.DialogMode == TreeDialogModes.fulllink && !this.IsDialog) + if (this.DialogMode == TreeDialogModes.fulllink ) { string nodeLink = CreateNodeLink(dd); treeElement.Action = String.Format("javascript:openContent('{0}');", nodeLink); } - else if (this.IsDialog) //(this.DialogMode == TreeDialogModes.locallink) + else if (this.DialogMode == TreeDialogModes.locallink) { string nodeLink = string.Format("{{localLink:{0}}}", dd.Id); // try to make a niceurl too diff --git a/umbraco/presentation/umbraco/Trees/BaseMediaTree.cs b/umbraco/presentation/umbraco/Trees/BaseMediaTree.cs index e6f8833384..fac401638d 100644 --- a/umbraco/presentation/umbraco/Trees/BaseMediaTree.cs +++ b/umbraco/presentation/umbraco/Trees/BaseMediaTree.cs @@ -57,7 +57,7 @@ namespace umbraco.cms.presentation.Trees if (!string.IsNullOrEmpty(this.FunctionToCall)) { Javascript.Append("function openMedia(id) {\n"); - Javascript.Append(this.FunctionToCall + "(id)\n"); + Javascript.Append(this.FunctionToCall + "(id);\n"); Javascript.Append("}\n"); } else if (!this.IsDialog) @@ -69,19 +69,19 @@ function openMedia(id) { } "); } - else - { - //TODO: SD: Find out how what this does...? - Javascript.Append( - @" -function openMedia(id) { - if (parent.opener) - parent.opener.dialogHandler(id); - else - parent.dialogHandler(id); -} -"); - } + //TODO: SD: UPDATE ALL TREE CODE SO THAT THE FUNCTIONTOCALL IS EXPLICITLY SET WHEN DIALOGHANDLER IS REQUIRED! + // else +// { +// Javascript.Append( +// @" +//function openMedia(id) { +// if (parent.opener) +// parent.opener.dialogHandler(id); +// else +// parent.dialogHandler(id); +//} +//"); +// } } public override void Render(ref XmlTree tree) diff --git a/umbraco/presentation/umbraco/Trees/BaseTree.cs b/umbraco/presentation/umbraco/Trees/BaseTree.cs index 372b4734e5..a143bd69d2 100644 --- a/umbraco/presentation/umbraco/Trees/BaseTree.cs +++ b/umbraco/presentation/umbraco/Trees/BaseTree.cs @@ -291,6 +291,7 @@ namespace umbraco.cms.presentation.Trees this.IsDialog = treeParams.IsDialog; this.ShowContextMenu = treeParams.ShowContextMenu; this.id = treeParams.StartNodeID; + if (!treeParams.ShowContextMenu) this.RootNode.Menu = null; } diff --git a/umbraco/presentation/umbraco/Trees/ContentRecycleBin.cs b/umbraco/presentation/umbraco/Trees/ContentRecycleBin.cs index ae7dd12947..a85274d803 100644 --- a/umbraco/presentation/umbraco/Trees/ContentRecycleBin.cs +++ b/umbraco/presentation/umbraco/Trees/ContentRecycleBin.cs @@ -97,6 +97,12 @@ namespace umbraco.cms.presentation.Trees } } + /// + /// Override the render js so no duplicate js is rendered. + /// + /// + public override void RenderJS(ref StringBuilder Javascript) { } + ///// ///// Returns the tree service url to render the tree. Ensures that IsRecycleBin is flagged. ///// diff --git a/umbraco/presentation/umbraco/Trees/ITreeService.cs b/umbraco/presentation/umbraco/Trees/ITreeService.cs new file mode 100644 index 0000000000..afc96b25dd --- /dev/null +++ b/umbraco/presentation/umbraco/Trees/ITreeService.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.IO; +using System.Text; +using System.Web; +using System.Xml; +using System.Configuration; +using umbraco.BasePages; +using umbraco.BusinessLogic; +using umbraco.cms.businesslogic; +using umbraco.cms.businesslogic.cache; +using umbraco.cms.businesslogic.contentitem; +using umbraco.cms.businesslogic.datatype; +using umbraco.cms.businesslogic.language; +using umbraco.cms.businesslogic.media; +using umbraco.cms.businesslogic.member; +using umbraco.cms.businesslogic.property; +using umbraco.cms.businesslogic.web; +using umbraco.interfaces; +using umbraco.DataLayer; +using System.Collections.Specialized; + +namespace umbraco.cms.presentation.Trees +{ + /// + /// All Trees rely on the properties of an ITreeService interface. This has been created to avoid having trees + /// dependant on the HttpContext + /// + public interface ITreeService + { + /// + /// The NodeKey is a string representation of the nodeID. Generally this is used for tree's whos node's unique key value is a string in instead + /// of an integer such as folder names. + /// + string NodeKey { get; } + int StartNodeID { get; } + bool ShowContextMenu { get; } + bool IsDialog { get; } + TreeDialogModes DialogMode { get; } + string FunctionToCall { get; } + } +} diff --git a/umbraco/presentation/umbraco/Trees/MediaRecycleBin.cs b/umbraco/presentation/umbraco/Trees/MediaRecycleBin.cs index 9fde4231f4..e0be6c9313 100644 --- a/umbraco/presentation/umbraco/Trees/MediaRecycleBin.cs +++ b/umbraco/presentation/umbraco/Trees/MediaRecycleBin.cs @@ -81,6 +81,12 @@ namespace umbraco.cms.presentation.Trees } } + /// + /// Override the render js so no duplicate js is rendered. + /// + /// + public override void RenderJS(ref StringBuilder Javascript) { } + protected override void CreateRootNode(ref XmlTreeNode rootNode) { rootNode.Icon = "bin_empty.png"; diff --git a/umbraco/presentation/umbraco/Trees/TreeDefinitionCollection.cs b/umbraco/presentation/umbraco/Trees/TreeDefinitionCollection.cs index d399d8d2c8..093608bf36 100644 --- a/umbraco/presentation/umbraco/Trees/TreeDefinitionCollection.cs +++ b/umbraco/presentation/umbraco/Trees/TreeDefinitionCollection.cs @@ -141,7 +141,7 @@ namespace umbraco.cms.presentation.Trees if (this.Count > 0) return; - List foundITrees = TypeFinder.FindClassesOfType(true); + List foundITrees = TypeFinder.FindClassesOfType(); ApplicationTree[] objTrees = ApplicationTree.getAll(); List appTrees = new List(); diff --git a/umbraco/presentation/umbraco/Trees/TreeRequestParams.cs b/umbraco/presentation/umbraco/Trees/TreeRequestParams.cs new file mode 100644 index 0000000000..8e76651b57 --- /dev/null +++ b/umbraco/presentation/umbraco/Trees/TreeRequestParams.cs @@ -0,0 +1,153 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.IO; +using System.Text; +using System.Web; +using System.Xml; +using System.Configuration; +using umbraco.BasePages; +using umbraco.BusinessLogic; +using umbraco.cms.businesslogic; +using umbraco.cms.businesslogic.cache; +using umbraco.cms.businesslogic.contentitem; +using umbraco.cms.businesslogic.datatype; +using umbraco.cms.businesslogic.language; +using umbraco.cms.businesslogic.media; +using umbraco.cms.businesslogic.member; +using umbraco.cms.businesslogic.property; +using umbraco.cms.businesslogic.web; +using umbraco.interfaces; +using umbraco.DataLayer; +using System.Collections.Specialized; + +namespace umbraco.cms.presentation.Trees +{ + /// + /// An ITreeService class that returns the values found in the Query String or any dictionary + /// + internal class TreeRequestParams : ITreeService + { + private TreeRequestParams() { } + + private Dictionary m_params; + + public static TreeRequestParams FromQueryStrings() + { + Dictionary p = new Dictionary(); + foreach (string key in HttpContext.Current.Request.QueryString.Keys) + { + p.Add(key, HttpContext.Current.Request.QueryString[key]); + //p.Add(item.Key.ToString(), item.Value.ToString()); + } + return FromDictionary(p); + } + + public static TreeRequestParams FromDictionary(Dictionary items) + { + TreeRequestParams treeParams = new TreeRequestParams(); + treeParams.m_params = items; + return treeParams; + } + + /// + /// Converts the tree parameters to a tree service object + /// + /// + public TreeService CreateTreeService() + { + return new TreeService() + { + ShowContextMenu = this.ShowContextMenu, + IsDialog = this.IsDialog, + DialogMode = this.DialogMode, + App = this.Application, + TreeType = this.TreeType, + NodeKey = this.NodeKey, + StartNodeID = this.StartNodeID, + FunctionToCall = this.FunctionToCall + }; + } + + public string NodeKey + { + get + { + return (m_params.ContainsKey("nodeKey") ? m_params["nodeKey"] : ""); + } + } + public string Application + { + get + { + return (m_params.ContainsKey("app") ? m_params["app"] : m_params.ContainsKey("appAlias") ? m_params["appAlias"] : ""); + } + } + public int StartNodeID + { + get + { + string val = (m_params.ContainsKey("id") ? m_params["id"] : ""); + int sNodeID; + if (int.TryParse(HttpContext.Current.Request.QueryString["id"], out sNodeID)) + return sNodeID; + return -1; + } + } + public string FunctionToCall + { + get + { + return (m_params.ContainsKey("functionToCall") ? m_params["functionToCall"] : ""); + } + } + public bool IsDialog + { + get + { + bool value; + if (m_params.ContainsKey("isDialog")) + if (bool.TryParse(m_params["isDialog"], out value)) + return value; + return false; + } + } + public TreeDialogModes DialogMode + { + get + { + if (m_params.ContainsKey("dialogMode") && IsDialog) + { + try + { + return (TreeDialogModes)Enum.Parse(typeof(TreeDialogModes), m_params["dialogMode"]); + } + catch + { + return TreeDialogModes.none; + } + } + return TreeDialogModes.none; + } + } + public bool ShowContextMenu + { + get + { + bool value; + if (m_params.ContainsKey("contextMenu")) + if (bool.TryParse(m_params["contextMenu"], out value)) + return value; + return true; + } + } + public string TreeType + { + get + { + return (m_params.ContainsKey("treeType") ? m_params["treeType"] : ""); + } + } + } +} diff --git a/umbraco/presentation/umbraco/Trees/TreeService.cs b/umbraco/presentation/umbraco/Trees/TreeService.cs index 2fed4d50a6..458798dd38 100644 --- a/umbraco/presentation/umbraco/Trees/TreeService.cs +++ b/umbraco/presentation/umbraco/Trees/TreeService.cs @@ -22,39 +22,22 @@ using umbraco.interfaces; using umbraco.DataLayer; using System.Collections.Specialized; using umbraco.IO; +using umbraco.uicontrols; namespace umbraco.cms.presentation.Trees { - /// - /// All Trees rely on the properties of an ITreeService interface. This has been created to avoid having trees - /// dependant on the HttpContext - /// - public interface ITreeService - { - /// - /// The NodeKey is a string representation of the nodeID. Generally this is used for tree's whos node's unique key value is a string in instead - /// of an integer such as folder names. - /// - string NodeKey { get; } - int StartNodeID { get; } - bool ShowContextMenu { get; } - bool IsDialog { get; } - TreeDialogModes DialogMode { get; } - string FunctionToCall { get; } - } - /// /// A utility class to aid in creating the URL for returning XML for a tree structure and /// for reading the parameters from the URL when a request is made. /// - public class TreeService : ITreeService + public class TreeService : TreeUrlGenerator, ITreeService { /// /// Default empty constructor /// - public TreeService() { } + public TreeService() : base() { } /// /// Constructor to assign all TreeService properties except nodeKey in one call @@ -68,12 +51,12 @@ namespace umbraco.cms.presentation.Trees public TreeService(int? startNodeID, string treeType, bool? showContextMenu, bool? isDialog, TreeDialogModes dialogMode, string app) { - m_startNodeID = startNodeID; - m_treeType = treeType; - m_showContextMenu = showContextMenu; - m_isDialog = isDialog; + StartNodeID = startNodeID ?? -1; + TreeType = treeType; + ShowContextMenu = showContextMenu ?? true; + IsDialog = isDialog ?? false; m_dialogMode = dialogMode; - m_app = app; + App = app; } /// @@ -89,78 +72,32 @@ namespace umbraco.cms.presentation.Trees public TreeService(int? startNodeID, string treeType, bool? showContextMenu, bool? isDialog, TreeDialogModes dialogMode, string app, string nodeKey) { - m_startNodeID = startNodeID; - m_treeType = treeType; - m_showContextMenu = showContextMenu; - m_isDialog = isDialog; + StartNodeID = startNodeID ?? -1; + TreeType = treeType; + ShowContextMenu = showContextMenu ?? true; + IsDialog = isDialog ?? false; m_dialogMode = dialogMode; - m_app = app; - m_nodeKey = nodeKey; + App = app; + NodeKey = nodeKey; } public TreeService(int? startNodeID, string treeType, bool? showContextMenu, bool? isDialog, TreeDialogModes dialogMode, string app, string nodeKey, string functionToCall) { - m_startNodeID = startNodeID; - m_treeType = treeType; - m_showContextMenu = showContextMenu; - m_isDialog = isDialog; + StartNodeID = startNodeID ?? -1; + TreeType = treeType; + ShowContextMenu = showContextMenu ?? true; + IsDialog = isDialog ?? false; m_dialogMode = dialogMode; - m_app = app; - m_nodeKey = nodeKey; - m_functionToCall = functionToCall; + App = app; + NodeKey = nodeKey; + FunctionToCall = functionToCall; } - public const string TREE_URL = "tree.aspx"; - public const string INIT_URL = "treeinit.aspx"; - public const string PICKER_URL = "treepicker.aspx"; - - private int? m_startNodeID; - private string m_treeType; - private bool? m_showContextMenu; - private bool? m_isDialog; - private TreeDialogModes m_dialogMode; - private string m_app; - private string m_nodeKey; - private string m_functionToCall; + private TreeDialogModes m_dialogMode; #region Public Properties - public string FunctionToCall - { - get { return m_functionToCall; } - set { m_functionToCall = value; } - } - - public string NodeKey - { - get { return m_nodeKey; } - set { m_nodeKey = value; } - } - - public int StartNodeID - { - get { return m_startNodeID ?? -1; } - set { m_startNodeID = value; } - } - - public string TreeType - { - get { return m_treeType; } - set { m_treeType = value; } - } - - public bool ShowContextMenu - { - get { return m_showContextMenu ?? true; } - set { m_showContextMenu = value; } - } - - public bool IsDialog - { - get { return m_isDialog ?? false; } - set { m_isDialog = value; } - } public TreeDialogModes DialogMode { @@ -168,22 +105,8 @@ namespace umbraco.cms.presentation.Trees set { m_dialogMode = value; } } - public string App - { - get { return m_app; } - set { m_app = value; } - } #endregion - /// - /// Returns the url for servicing the xml tree request based on the parameters specified on this class. - /// - /// Tree service url as a string - public string GetServiceUrl() - { - return SystemDirectories.Umbraco + "/" + GetUrl(TREE_URL); - } - /// /// Static method to return the tree service url with the specified parameters /// @@ -203,15 +126,6 @@ namespace umbraco.cms.presentation.Trees return treeSvc.GetServiceUrl(); } - /// - /// Returns the url for initializing the tree based on the parameters specified on this class - /// - /// - public string GetInitUrl() - { - return IOHelper.ResolveUrl( SystemDirectories.Umbraco + "/" + GetUrl(INIT_URL) ); - } - /// /// static method to return the tree init url with the specified parameters /// @@ -231,161 +145,12 @@ namespace umbraco.cms.presentation.Trees return treeSvc.GetInitUrl(); } - /// - /// Returns the url for the tree picker (used on modal windows) based on the parameters specified on this class - /// - /// - /// - public static string GetPickerUrl(bool useSubModal, string app, string treeType) - { - TreeService treeSvc = new TreeService(); - treeSvc.App = app; - treeSvc.TreeType = treeType; - return treeSvc.GetPickerUrl(useSubModal); - } + protected override string GetUrl(string pageUrl) + { + StringBuilder sb = new StringBuilder(base.GetUrl(pageUrl)); + if (this.DialogMode != TreeDialogModes.none) sb.Append(string.Format("&dialogMode={0}", this.DialogMode.ToString())); + return sb.ToString(); + } - /// - /// Returns the url for the tree picker (used on modal windows) based on the parameters specified on this class - /// - /// - /// - public string GetPickerUrl(bool useSubModal) - { - string url = IOHelper.ResolveUrl( SystemDirectories.Umbraco + "/dialogs/" + GetUrl(PICKER_URL) ); - return url + (useSubModal ? "&useSubModal=true" : ""); - } - - /// - /// Generates the URL parameters for the tree service. - /// - /// the base url (i.e. tree.aspx) - /// - private string GetUrl(string pageUrl) - { - StringBuilder sb = new StringBuilder(); - - sb.Append(pageUrl); - //insert random - sb.Append(string.Format("?rnd={0}", Guid.NewGuid())); - - sb.Append(string.Format("&id={0}", this.StartNodeID.ToString())); - if (!string.IsNullOrEmpty(this.TreeType)) sb.Append(string.Format("&treeType={0}", this.TreeType)); - if (!string.IsNullOrEmpty(this.NodeKey)) sb.Append(string.Format("&nodeKey={0}", this.NodeKey)); - sb.Append(string.Format("&contextMenu={0}", this.ShowContextMenu.ToString().ToLower())); - sb.Append(string.Format("&isDialog={0}", this.IsDialog.ToString().ToLower())); - if (this.DialogMode != TreeDialogModes.none) sb.Append(string.Format("&dialogMode={0}", this.DialogMode.ToString())); - if (!string.IsNullOrEmpty(this.App)) sb.Append(string.Format("&app={0}", this.App)); - - return sb.ToString(); - } - - } - - /// - /// An ITreeService class that returns the values found in the Query String or any dictionary - /// - internal class TreeRequestParams : ITreeService - { - private TreeRequestParams() { } - - private Dictionary m_params; - - public static TreeRequestParams FromQueryStrings() - { - Dictionary p = new Dictionary(); - foreach (string key in HttpContext.Current.Request.QueryString.Keys) - { - p.Add(key, HttpContext.Current.Request.QueryString[key]); - //p.Add(item.Key.ToString(), item.Value.ToString()); - } - return FromDictionary(p); - } - - public static TreeRequestParams FromDictionary(Dictionary items) - { - TreeRequestParams treeParams = new TreeRequestParams(); - treeParams.m_params = items; - return treeParams; - } - - public string NodeKey - { - get - { - return (m_params.ContainsKey("nodeKey") ? m_params["nodeKey"] : ""); - } - } - public string Application - { - get - { - return (m_params.ContainsKey("app") ? m_params["app"] : m_params.ContainsKey("appAlias") ? m_params["appAlias"] : ""); - } - } - public int StartNodeID - { - get - { - string val = (m_params.ContainsKey("id") ? m_params["id"] : ""); - int sNodeID; - if (int.TryParse(HttpContext.Current.Request.QueryString["id"], out sNodeID)) - return sNodeID; - return -1; - } - } - public string FunctionToCall - { - get - { - return (m_params.ContainsKey("functionToCall") ? m_params["functionToCall"] : ""); - } - } - public bool IsDialog - { - get - { - bool value; - if (m_params.ContainsKey("isDialog")) - if (bool.TryParse(m_params["isDialog"], out value)) - return value; - return false; - } - } - public TreeDialogModes DialogMode - { - get - { - if (m_params.ContainsKey("dialogMode") && IsDialog) - { - try - { - return (TreeDialogModes)Enum.Parse(typeof(TreeDialogModes), m_params["dialogMode"]); - } - catch - { - return TreeDialogModes.none; - } - } - return TreeDialogModes.none; - } - } - public bool ShowContextMenu - { - get - { - bool value; - if (m_params.ContainsKey("contextMenu")) - if (bool.TryParse(m_params["contextMenu"], out value)) - return value; - return true; - } - } - public string TreeType - { - get - { - return (m_params.ContainsKey("treeType") ? m_params["treeType"] : ""); - } - } } } diff --git a/umbraco/presentation/umbraco/Trees/loadMedia.cs b/umbraco/presentation/umbraco/Trees/loadMedia.cs index b070308066..b85b63fae0 100644 --- a/umbraco/presentation/umbraco/Trees/loadMedia.cs +++ b/umbraco/presentation/umbraco/Trees/loadMedia.cs @@ -54,7 +54,7 @@ namespace umbraco protected override void CreateRootNode(ref XmlTreeNode rootNode) { - //TODO: SD: Find out what openMedia does!? + if (this.IsDialog) rootNode.Action = "javascript:openMedia(-1);"; else diff --git a/umbraco/presentation/umbraco/cache/factory.cs b/umbraco/presentation/umbraco/cache/factory.cs index a29a035a82..9136e446b9 100644 --- a/umbraco/presentation/umbraco/cache/factory.cs +++ b/umbraco/presentation/umbraco/cache/factory.cs @@ -34,7 +34,7 @@ namespace umbraco.presentation.cache private static void Initialize() { - List types = TypeFinder.FindClassesOfType(true); + List types = TypeFinder.FindClassesOfType(); foreach (Type t in types) { ICacheRefresher typeInstance = Activator.CreateInstance(t) as ICacheRefresher; diff --git a/umbraco/presentation/umbraco/controls/ContentPicker.cs b/umbraco/presentation/umbraco/controls/ContentPicker.cs index 95cffaa2d9..6edbe3f3ae 100644 --- a/umbraco/presentation/umbraco/controls/ContentPicker.cs +++ b/umbraco/presentation/umbraco/controls/ContentPicker.cs @@ -8,135 +8,70 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using umbraco.cms.presentation.Trees; -using ClientDependency.Core; using umbraco.presentation; -using ClientDependency.Core.Controls; +using umbraco.uicontrols.TreePicker; namespace umbraco.controls { - [ClientDependency(ClientDependencyType.Javascript, "js/xmlextras.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Javascript, "js/xmlRequest.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Javascript, "webservices/ajax.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Javascript, "js/submodal/subModal.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Css, "js/submodal/subModal.css", "UmbracoRoot")] - public class ContentPicker : System.Web.UI.WebControls.WebControl + + public class ContentPicker : BaseTreePicker { - public System.Web.UI.Control Editor { get { return this; } } + public ContentPicker() + { + AppAlias = "content"; + TreeAlias = "content"; + } - private string _text = ""; + [Obsolete("Use Value property instead, this simply wraps it.")] public string Text { get { - if (Page.IsPostBack && !String.IsNullOrEmpty(helper.Request(this.ClientID))) - { - _text = helper.Request(this.ClientID); - } - return _text; + return this.Value; } - set { _text = value; } + set + { + this.Value = value; + } } - private string _appAlias = "content"; - public string AppAlias - { - get { return _appAlias; } - set { _appAlias = value; } - } + public string AppAlias { get; set; } + public string TreeAlias { get; set; } + public override string TreePickerUrl + { + get + { + return TreeService.GetPickerUrl(AppAlias, TreeAlias); + } + } - private string _treeAlias = "content"; - public string TreeAlias - { - get { return _treeAlias; } - set { _treeAlias = value; } - } + public override string ModalWindowTitle + { + get + { + return ui.GetText("general", "choose") + " " + ui.GetText("sections", TreeAlias.ToLower()); + } + } - private bool _showDelete = true; - public bool ShowDelete - { - get { return _showDelete; } - set { _showDelete = value; } - } - - private int m_modalWidth = 300; - public int ModalWidth - { - get { return m_modalWidth; } - set { m_modalWidth = value; } - } - - private int m_modalHeight = 400; - public int ModalHeight - { - get { return m_modalHeight; } - set { m_modalHeight = value; } - } - - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - - // We need to make sure we have a reference to the legacy ajax calls in the scriptmanager - if (!UmbracoContext.Current.LiveEditingContext.Enabled) - presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page); - else - ClientDependencyLoader.Instance.RegisterDependency("webservices/legacyAjaxCalls.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); - } - - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - - string tempTitle = ""; - string deleteLink = "   " + ui.Text("delete") + "   "; - try - { - if (this.Text != "" && this.Text != "-1") - { - tempTitle = new cms.businesslogic.CMSNode(int.Parse(this.Text)).Text; - } - else - { - tempTitle = (!string.IsNullOrEmpty(_treeAlias) ? ui.Text(_treeAlias) : ui.Text(_appAlias)); - - } - } - catch { } - - writer.WriteLine(""); - - // Clear remove link if text if empty - if (this.Text == "" || !_showDelete) - deleteLink = ""; - writer.WriteLine("" + tempTitle + "" + deleteLink + " " + ui.Text("choose") + "...   "); - base.Render(writer); - } + protected override string GetItemTitle() + { + string tempTitle = ""; + try + { + if (this.Text != "" && this.Text != "-1") + { + tempTitle = new cms.businesslogic.CMSNode(int.Parse(this.Text)).Text; + } + else + { + tempTitle = (!string.IsNullOrEmpty(TreeAlias) ? ui.Text(TreeAlias) : ui.Text(AppAlias)); + } + } + catch { } + return tempTitle; + } } } diff --git a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs index 2d0ac21a7f..a2dc0fed6e 100644 --- a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs +++ b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs @@ -15,7 +15,7 @@ namespace umbraco.controls [ClientDependency(ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient")] [ClientDependency(ClientDependencyType.Css, "Tree/treeIcons.css", "UmbracoClient")] - [ClientDependency(ClientDependencyType.Css, "Tree/Themes/umbraco/styles.css", "UmbracoClient")] + [ClientDependency(ClientDependencyType.Css, "Tree/Themes/umbraco/style.css", "UmbracoClient")] public partial class ContentTypeControlNew : System.Web.UI.UserControl { public uicontrols.TabPage InfoTabPage; diff --git a/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx b/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx index a3042a6876..79b4077607 100644 --- a/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx +++ b/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx @@ -13,10 +13,6 @@ - - diff --git a/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs index 9e2ec192d3..e9cba9dd4a 100644 --- a/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs +++ b/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs @@ -168,7 +168,7 @@ namespace umbraco.controls.GenericProperties DeleteButton2.Visible = false; } validationLink.NavigateUrl = "#"; - validationLink.Attributes["onclick"] = ClientTools.Scripts.OpenModalWindow("dialogs/regexWs.aspx?target=" + tbValidation.ClientID , "Search for regular expression", 500, 600) + ";return false;"; + validationLink.Attributes["onclick"] = ClientTools.Scripts.OpenModalWindow("dialogs/regexWs.aspx?target=" + tbValidation.ClientID, "Search for regular expression", 600, 500) + ";return false;"; // Data type definitions if (_dataTypeDefinitions != null) diff --git a/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs b/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs index db7127ceb9..b953baaa55 100644 --- a/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs +++ b/umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx b/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx new file mode 100644 index 0000000000..0ceb3cd09a --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx @@ -0,0 +1,48 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ImageViewer.ascx.cs" Inherits="umbraco.controls.Images.ImageViewer" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> + +
+ + + + + <%#AltText%> + + + + <%#AltText%> + + +
');"> +
+ + + + + <%--Register the javascript callback method if any.--%> + + +
+<%--Ensure that the client API is registered for the image.--%> + + + diff --git a/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.cs b/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.cs new file mode 100644 index 0000000000..0d54d11289 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using umbraco.cms.businesslogic.media; + +namespace umbraco.controls.Images +{ + public partial class ImageViewer : System.Web.UI.UserControl + { + + public ImageViewer() + { + MediaItemPath = "#"; + MediaItemThumbnailPath = umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/images/blank.png"; + AltText = "No Image"; + ImageFound = false; + ViewerStyle = Style.Basic; + LinkTarget = "_blank"; + } + + + /// + /// A JS method to invoke when the image is loaded. The method should accept the media ID. + /// + public string ClientCallbackMethod { get; set; } + + public int MediaId { get; set; } + + /// + /// The style to render the image viewer in + /// + public enum Style + { + Basic = 0, + ImageLink = 1, + ThumbnailPreview = 2 + } + + public Style ViewerStyle { get; set; } + + public string LinkTarget { get; set; } + + public string MediaItemPath { get; private set; } + public string MediaItemThumbnailPath { get; private set; } + public string AltText { get; private set; } + public int FileWidth { get { return m_FileWidth; } } + public int FileHeight { get { return m_FileHeight; } } + + protected bool ImageFound { get; private set; } + + + private int m_FileWidth = 0; + private int m_FileHeight = 0; + private bool m_IsBound = false; + + /// + /// automatically bind if it's not explicitly called. + /// + /// + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + if (!m_IsBound) + { + DataBind(); + } + } + + public override void DataBind() + { + LookupData(); + base.DataBind(); + this.m_IsBound = true; + } + + private void LookupData() + { + if (MediaId > 0) + { + Media m = new Media(MediaId); + + // TODO: Remove "Magic strings" from code. + var pFile = m.getProperty("fileName"); + if (pFile == null) pFile = m.getProperty("umbracoFile"); + if (pFile == null) pFile = m.getProperty("file"); + if (pFile == null) + { + //the media requested does not correspond with the standard umbraco properties + return; + } + + MediaItemPath = pFile.Value != null && !string.IsNullOrEmpty(pFile.Value.ToString()) + ? umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/.." + pFile.Value.ToString() + : "#"; + AltText = MediaItemPath != "#" ? m.Text : ui.GetText("no") + " " + ui.GetText("media"); + + var pWidth = m.getProperty("umbracoWidth"); + var pHeight = m.getProperty("umbracoHeight"); + + if (pWidth != null && pWidth.Value != null && pHeight != null && pHeight.Value != null) + { + int.TryParse(pHeight.Value.ToString(), out m_FileWidth); + int.TryParse(pHeight.Value.ToString(), out m_FileHeight); + } + + string ext = MediaItemPath.Substring(MediaItemPath.LastIndexOf(".") + 1, MediaItemPath.Length - MediaItemPath.LastIndexOf(".") - 1); + MediaItemThumbnailPath = MediaItemPath.Replace("." + ext, "_thumb.jpg"); + + ImageFound = true; + } + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.designer.cs b/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.designer.cs new file mode 100644 index 0000000000..c5e0edd1b1 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/ImageViewer.ascx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace umbraco.controls.Images { + + + public partial class ImageViewer { + + /// + /// JsInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + } +} diff --git a/umbraco/presentation/umbraco/controls/Images/ImageViewer.js b/umbraco/presentation/umbraco/controls/Images/ImageViewer.js new file mode 100644 index 0000000000..2924c4f81e --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/ImageViewer.js @@ -0,0 +1,133 @@ +/// +/// + +Umbraco.Sys.registerNamespace("Umbraco.Controls"); + +(function($) { + //jQuery plugin for Umbraco image viewer control + $.fn.UmbracoImageViewer = function(opts) { + //all options must be specified + var conf = $.extend({ + style: false, + linkTarget: "_blank", + umbPath: "" + }, opts); + return this.each(function() { + new Umbraco.Controls.ImageViewer().init($(this), conf); + }); + } + $.fn.UmbracoImageViewerAPI = function() { + /// exposes the Umbraco Image Viewer api for the selected object + //if there's more than item in the selector, throw exception + if ($(this).length != 1) { + throw "UmbracoImageViewerAPI selector requires that there be exactly one control selected"; + }; + return Umbraco.Controls.ImageViewer.inst[$(this).attr("id")] || null; + }; + Umbraco.Controls.ImageViewer = function() { + return { + _cntr: ++Umbraco.Controls.ImageViewer.cntr, + _containerId: null, + _context: null, + _serviceUrl: "", + _umbPath: "", + _style: false, + _linkTarget: "", + + init: function(jItem, opts) { + //this is stored so that we search the current document/iframe for this object + //when calling _getContainer. Before this was not required but for some reason inside the + //TinyMCE popup, when doing an ajax call, the context is lost to the jquery item! + this._context = jItem.get(0).ownerDocument; + + //store a reference to this api by the id and the counter + Umbraco.Controls.ImageViewer.inst[this._cntr] = this; + if (!jItem.attr("id")) jItem.attr("id", "UmbImageViewer_" + this._cntr); + Umbraco.Controls.ImageViewer.inst[jItem.attr("id")] = Umbraco.Controls.ImageViewer.inst[this._cntr]; + + this._containerId = jItem.attr("id"); + + this._umbPath = opts.umbPath; + this._serviceUrl = this._umbPath + "/controls/Images/ImageViewerUpdater.asmx"; + this._style = opts.style; + this._linkTarget = opts.linkTarget; + + }, + + updateImage: function(mediaId, callback) { + /// Updates the image to show the mediaId parameter using AJAX + + this._showThrobber(); + + var _this = this; + $.ajax({ + type: "POST", + url: _this._serviceUrl + "/UpdateImage", + data: '{ "mediaId": ' + parseInt(mediaId) + ', "style": "' + _this._style + '", "linkTarget": "' + _this._linkTarget + '"}', + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function(msg) { + var rHtml = $("
").append(msg.d.html); //get the full html response wrapped in temp div + _this._updateImageFromAjax(rHtml); + if (typeof callback == "function") { + //build the parameters to pass back to the callback method + var params = { + hasImage: _this._getContainer().find("img.noimage").length == 0, + mediaId: msg.d.mediaId, + width: msg.d.width, + height: msg.d.height, + url: msg.d.url, + alt: msg.d.alt + }; + //call the callback method + callback.call(_this, params); + } + } + }); + }, + + showImage: function(path) { + /// This will force the image to show the path passed in + if (this._style != "ThumbnailPreview") { + this._getContainer().find("img").attr("src", path); + } + else { + c = this._getContainer().find(".bgImage"); + c.css("background-image", "url('" + path + "')"); + } + }, + + _getContainer: function() { + return $("#" + this._containerId, this._context); + }, + + _updateImageFromAjax: function(rHtml) { + this._getContainer().html(rHtml.find(".imageViewer").html()); //replace the html with the inner html of the image viewer response + }, + + _showThrobber: function() { + var c = null; + if (this._style != "ThumbnailPreview") { + c = this._getContainer().find("img"); + c.attr("src", this._umbPath + "/images/throbber.gif"); + c.css("margin-top", ((c.height() - 15) / 2) + "px"); + c.css("margin-left", ((c.width() - 15) / 2) + "px"); + } + else { + c = this._getContainer().find(".bgImage"); + c.css("background-image", ""); + c.html(""); + var img = c.find("img"); + img.attr("src", this._umbPath + "/images/throbber.gif"); + img.css("margin-top", "45px"); + img.css("margin-left", "45px"); + } + } + } + } + + // instance manager + Umbraco.Controls.ImageViewer.cntr = 0; + Umbraco.Controls.ImageViewer.inst = {}; + +})(jQuery); \ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx b/umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx new file mode 100644 index 0000000000..e5ab3a9652 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="ImageViewerUpdater.asmx.cs" Class="umbraco.controls.Images.ImageViewerUpdater" %> diff --git a/umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs b/umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs new file mode 100644 index 0000000000..b3491211a7 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Services; +using System.ComponentModel; +using System.Web.Script.Services; +using System.Web.UI; +using umbraco.controls.Images; +using System.IO; +using System.Web.Script.Serialization; +using umbraco.businesslogic.Utils; + +namespace umbraco.controls.Images +{ + /// + /// An ajax service to return the html for an image based on a media id + /// + [WebService(Namespace = "http://tempuri.org/")] + [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] + [ToolboxItem(false)] + [ScriptService] + public class ImageViewerUpdater : System.Web.Services.WebService + { + + /// + /// return the a json object with the properties + /// html = the html returned for rendering the image viewer + /// mediaId = the media id loaded + /// width = the width of the media (0) if not found + /// height = the height of the media (0) if not found + /// url = the url of the image + /// alt = the alt text for the image + /// + /// + [WebMethod] + public Dictionary UpdateImage(int mediaId, string style, string linkTarget) + { + //load the control with the specified properties and render the output as a string and return it + Page page = new Page(); + string path = umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/controls/Images/ImageViewer.ascx"; + + ImageViewer imageViewer = page.LoadControl(path) as ImageViewer; + imageViewer.MediaId = mediaId; + ImageViewer.Style _style = (ImageViewer.Style)Enum.Parse(typeof(ImageViewer.Style), style); + imageViewer.ViewerStyle = _style; + imageViewer.LinkTarget = linkTarget; + + //this adds only the anchor with image to be rendered, not the whole control! + page.Controls.Add(imageViewer); + + imageViewer.DataBind(); + + StringWriter sw = new StringWriter(); + HttpContext.Current.Server.Execute(page, sw, false); + + Dictionary rVal = new Dictionary(); + rVal.Add("html", sw.ToString()); + rVal.Add("mediaId", imageViewer.MediaId.ToString()); + rVal.Add("width", imageViewer.FileWidth.ToString()); + rVal.Add("height", imageViewer.FileHeight.ToString()); + rVal.Add("url", imageViewer.MediaItemPath); + rVal.Add("alt", imageViewer.AltText); + + return rVal; + } + } +} diff --git a/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx new file mode 100644 index 0000000000..5c8cfd3257 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx @@ -0,0 +1,28 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UploadMediaImage.ascx.cs" + Inherits="umbraco.controls.Images.UploadMediaImage" %> +<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> +<%@ Register TagPrefix="ctl" Namespace="umbraco.controls" Assembly="umbraco" %> + + + + + + + + + + + + + + + + + + + + diff --git a/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs new file mode 100644 index 0000000000..767351fa84 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs @@ -0,0 +1,117 @@ +using System; +using System.Collections; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Web; +using System.Web.SessionState; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.HtmlControls; +using System.Linq; +using System.Xml; +using umbraco.BasePages; +using umbraco.uicontrols; +using umbraco.interfaces; +using umbraco.cms.businesslogic.media; + +namespace umbraco.controls.Images +{ + + /// + /// A control to render out the controls to upload a new image to media. + /// Includes ability to select where in the media you would like it to upload and also supports client + /// callback methods once complete. + /// + public partial class UploadMediaImage : System.Web.UI.UserControl + { + + public UploadMediaImage() + { + OnClientUpload = ""; + } + + /// + /// The JavaScript method to be invoked once the image is uploaded, the page is rendered and the document is ready. + /// The method will receive a JSON object with the following parameters: + /// - imagePath + /// - thumbnailPath + /// - width + /// - height + /// - id + /// + public string OnClientUpload { get; set; } + + protected IDataType UploadField = new cms.businesslogic.datatype.controls.Factory().GetNewObject(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + + protected override void OnInit(EventArgs e) + { + + base.OnInit(e); + // Get upload field from datafield factory + UploadControl.Controls.Add((Control)UploadField.DataEditor); + } + + protected void Page_Load(object sender, EventArgs e) + { + + ((HtmlInputFile)UploadField.DataEditor).ID = "uploadFile"; + if (!IsPostBack) + { + DataBind(); + } + + + } + + protected void SubmitButton_Click(object sender, EventArgs e) + { + Media m = Media.MakeNew(TextBoxTitle.Text, cms.businesslogic.media.MediaType.GetByAlias("image"), BasePage.Current.getUser(), int.Parse(MediaPickerControl.Text)); + var props = m.getProperties; + foreach (cms.businesslogic.property.Property p in props) + { + if (p.PropertyType.DataTypeDefinition.DataType.Id == UploadField.Id) + { + UploadField.DataTypeDefinitionId = p.PropertyType.DataTypeDefinition.Id; + UploadField.Data.PropertyId = p.Id; + } + } + UploadField.DataEditor.Save(); + + // Generate xml on image + m.XmlGenerate(new XmlDocument()); + pane_upload.Visible = false; + + //this seems real ugly since we apparently already have the properties above (props)... but this data layer is insane and undecipherable:) + string mainImage = m.getProperty("umbracoFile").Value.ToString(); + string extension = mainImage.Substring(mainImage.LastIndexOf(".") + 1, mainImage.Length - mainImage.LastIndexOf(".") - 1); + var thumbnail = mainImage.Remove(mainImage.Length - extension.Length - 1, extension.Length + 1) + "_thumb.jpg"; + string width = m.getProperty("umbracoWidth").Value.ToString(); + string height = m.getProperty("umbracoHeight").Value.ToString(); + int id = m.Id; + + feedback.Style.Add("margin-top", "8px"); + feedback.type = uicontrols.Feedback.feedbacktype.success; + feedback.Text += ""; + + if (!string.IsNullOrEmpty(OnClientUpload)) + { + feedback.Text += @" + "; + } + + } + + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + + ((HtmlInputFile)UploadField.DataEditor).Attributes.Add("onChange", "uploader_" + this.ClientID + ".validateImage();"); + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs new file mode 100644 index 0000000000..0ecc358f57 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs @@ -0,0 +1,109 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4200 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace umbraco.controls.Images +{ + + + public partial class UploadMediaImage { + + /// + /// JsInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + + /// + /// pane_upload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane pane_upload; + + /// + /// pp_name control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel pp_name; + + /// + /// TextBoxTitle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox TextBoxTitle; + + /// + /// pp_file control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel pp_file; + + /// + /// UploadControl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder UploadControl; + + /// + /// pp_target control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel pp_target; + + /// + /// pp_button control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel pp_button; + + /// + /// SubmitButton control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button SubmitButton; + + /// + /// feedback control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Feedback feedback; + + protected global::umbraco.controls.ContentPicker MediaPickerControl; + } +} diff --git a/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.js b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.js new file mode 100644 index 0000000000..fb9f8bcea2 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Images/UploadMediaImage.js @@ -0,0 +1,33 @@ +/// + +Umbraco.Sys.registerNamespace("Umbraco.Controls"); + +(function($) { + Umbraco.Controls.UploadMediaImage = function(txtBoxTitleID, btnID, uploadFileID) { + return { + _txtBoxTitleID: txtBoxTitleID, + _btnID: btnID, + _uplaodFileID: uploadFileID, + + validateImage: function() { + // Disable save button + var imageTypes = ",jpeg,jpg,gif,bmp,png,tiff,tif,"; + var tb_title = document.getElementById(this._txtBoxTitleID); + var bt_submit = $("#" + this._btnID); + var tb_image = document.getElementById(this._uplaodFileID); + + bt_submit.attr("disabled","disabled").css("color", "gray"); + + var imageName = tb_image.value; + if (imageName.length > 0) { + var extension = imageName.substring(imageName.lastIndexOf(".") + 1, imageName.length); + if (imageTypes.indexOf(',' + extension.toLowerCase() + ',') > -1) { + bt_submit.removeAttr("disabled").css("color", "#000"); + if (tb_title.value == "") + tb_title.value = imageName.substring(imageName.lastIndexOf("\\") + 1, imageName.length).replace("." + extension, ""); + } + } + } + }; + } +})(jQuery); \ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/Tree/JTreeContextMenu.cs b/umbraco/presentation/umbraco/controls/Tree/JTreeContextMenu.cs new file mode 100644 index 0000000000..d2b362fa8b --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Tree/JTreeContextMenu.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.Script.Serialization; +using umbraco.interfaces; +using System.Text.RegularExpressions; +using umbraco.BusinessLogic.Actions; +using umbraco.businesslogic.Utils; +using System.Text; +using umbraco.cms.presentation.Trees; +using umbraco.BasePages; +using System.Web.Services; + +namespace umbraco.controls.Tree +{ + internal class JTreeContextMenu + { + public string RenderJSONMenu() + { + + JSONSerializer jSSerializer = new JSONSerializer(); + + jSSerializer.RegisterConverters(new List() + { + new JTreeContextMenuItem() + }); + + List allActions = new List(); + foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll()) + { + if (!string.IsNullOrEmpty(a.Alias) && (!string.IsNullOrEmpty(a.JsFunctionName) || !string.IsNullOrEmpty(a.JsSource))) + { + allActions.Add(a); + } + + } + + + return jSSerializer.Serialize(allActions); + } + } +} diff --git a/umbraco/presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs b/umbraco/presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs new file mode 100644 index 0000000000..8b33f22670 --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.Script.Serialization; +using umbraco.interfaces; +using System.Text.RegularExpressions; +using umbraco.BusinessLogic.Actions; +using umbraco.businesslogic.Utils; +using System.Text; +using umbraco.cms.presentation.Trees; +using umbraco.BasePages; +using System.Web.Services; + +namespace umbraco.controls.Tree +{ + internal class JTreeContextMenuItem : JavaScriptConverter + { + + /// + /// Not implemented as we never need to Deserialize + /// + /// + /// + /// + /// + public override object Deserialize(IDictionary dictionary, Type type, JavaScriptSerializer serializer) + { + throw new NotImplementedException(); + } + + public override IDictionary Serialize(object obj, JavaScriptSerializer serializer) + { + //{ + // "id": "L", + // "label": "Create", + // "icon": "create.png", + // "visible": function(NODE, TREE_OBJ) { if (NODE.length != 1) return false; return TREE_OBJ.check("creatable", NODE); }, + // "action": function(NODE, TREE_OBJ) { TREE_OBJ.create(false, NODE); }, + //} + + + IAction a = (IAction)obj; + Dictionary data = new Dictionary(); + + data.Add("id", a.Letter); + data.Add("label", ui.Text(a.Alias)); + + if (a.Icon.StartsWith(".")) + { + StringBuilder sb = new StringBuilder(); + sb.Append(string.Format("
", a.Icon.TrimStart('.'))); + sb.Append("
"); + sb.Append("
"); + sb.Append(data["label"].ToString()); + sb.Append("
"); + data["label"] = sb.ToString(); + } + else + { + data.Add("icon", a.Icon); + } + + //required by jsTree + data.Add("visible", JSONSerializer.ToJSONObject("function() {return true;}")); + //The action handler is what is assigned to the IAction, but for flexibility, we'll call our onContextMenuSelect method which will need to return true if the function is to execute. + //TODO: Check if there is a JSSource + data.Add("action", JSONSerializer.ToJSONObject("function(N,T){" + a.JsFunctionName + ";}")); + + return data; + + } + + /// + /// TODO: Find out why we can't just return IAction as one type (JavaScriptSerializer doesn't seem to pick up on it) + /// + public override IEnumerable SupportedTypes + { + get + { + List types = new List(); + foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll()) + { + types.Add(a.GetType()); + } + return types; + } + + + } + } +} diff --git a/umbraco/presentation/umbraco/controls/TreeControl.ascx b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx similarity index 60% rename from umbraco/presentation/umbraco/controls/TreeControl.ascx rename to umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx index c7e13eba79..ec45eefdb8 100644 --- a/umbraco/presentation/umbraco/controls/TreeControl.ascx +++ b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="TreeControl.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.TreeControl" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="TreeControl.ascx.cs" Inherits="umbraco.controls.Tree.TreeControl" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> @@ -17,38 +17,49 @@ + -
"> + +
+
+
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.cs b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.cs new file mode 100644 index 0000000000..ec82fbc5cc --- /dev/null +++ b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.cs @@ -0,0 +1,390 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.Script.Serialization; +using umbraco.interfaces; +using System.Text.RegularExpressions; +using umbraco.BusinessLogic.Actions; +using umbraco.businesslogic.Utils; +using System.Text; +using umbraco.cms.presentation.Trees; +using umbraco.BasePages; +using System.Web.Services; +using System.Drawing; + +namespace umbraco.controls.Tree +{ + + /// + /// The Umbraco tree control. + /// If this control doesn't exist on an UmbracoEnsuredPage it will not work. + /// + public partial class TreeControl : System.Web.UI.UserControl, ITreeService + { + + /// + /// Set the defaults + /// + public TreeControl() + { + Width = Unit.Empty; + Height = Unit.Empty; + BackColor = Color.Empty; + CssClass = ""; + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + EnableViewState = false; + } + + public enum TreeMode + { + Standard, Checkbox, InheritedCheckBox + } + + /// + /// If there is not application or tree specified in a query string then this is the application to load. + /// + private const string DEFAULT_APP = "content"; + + private List m_ActiveTrees = new List(); + private List m_AllAppTrees = new List(); + private List m_ActiveTreeDefs = null; + private TreeMode m_TreeType = TreeMode.Standard; + private bool m_IsInit = false; + private TreeService m_TreeService = new TreeService(); + + #region Public Properties + + #region Style Properties + public string CssClass { get; set; } + public Unit Height { get; set; } + public Unit Width { get; set; } + public Color BackColor { get; set; } + #endregion + + #region TreeService parameters. + public string FunctionToCall + { + get { return m_TreeService.FunctionToCall; } + set + { + m_TreeService.FunctionToCall = value; + } + } + + public string NodeKey + { + get { return m_TreeService.NodeKey; } + set + { + m_TreeService.NodeKey = value; + } + } + + public int StartNodeID + { + get { return m_TreeService.StartNodeID; } + set + { + m_TreeService.StartNodeID = value; + } + } + + public string TreeType + { + get { return m_TreeService.TreeType; } + set + { + m_TreeService.TreeType = value; + } + } + + public bool ShowContextMenu + { + get { return m_TreeService.ShowContextMenu; } + set + { + m_TreeService.ShowContextMenu = value; + } + } + + public bool IsDialog + { + get { return m_TreeService.IsDialog; } + set + { + m_TreeService.IsDialog = value; + } + } + + public TreeDialogModes DialogMode + { + get { return m_TreeService.DialogMode; } + set + { + m_TreeService.DialogMode = value; + } + } + + + public string App + { + get + { + return GetCurrentApp(); + } + set + { + m_TreeService.App = value; + } + } + #endregion + + /// + /// Allows for checkboxes to be used with the tree. Default is standard. + /// + public TreeMode Mode + { + get + { + return m_TreeType; + } + set + { + m_TreeType = value; + } + } + + + /// + /// Returns the requires JavaScript as a string for the current application + /// + public string JSCurrApp + { + get + { + StringBuilder javascript = new StringBuilder(); + foreach (BaseTree bTree in m_AllAppTrees) + bTree.RenderJS(ref javascript); + return javascript.ToString(); + } + } + #endregion + + /// + /// Can be set explicitly which will override what is in query strings or what has been set by properties. + /// Useful for rendering out a tree dynamically with an instance of anoterh TreeService. + /// By using this method, it will undo any of the tree service public properties that may be set + /// on this object. + /// + public void SetTreeService(TreeService srv) + { + m_TreeService = srv; + Initialize(); + } + + /// + /// Initializes the control and looks up the tree structures that are required to be rendered. + /// Properties of the control (or SetTreeService) need to be set before pre render or calling + /// GetJSONContextMenu or GetJSONNode + /// + protected void Initialize() + { + //use the query strings if the TreeParams isn't explicitly set + if (m_TreeService == null) + { + m_TreeService = TreeRequestParams.FromQueryStrings().CreateTreeService(); + } + m_TreeService.App = GetCurrentApp(); + + // Validate permissions + if (!BasePages.BasePage.ValidateUserContextID(BasePages.BasePage.umbracoUserContextID)) + return; + UmbracoEnsuredPage page = new UmbracoEnsuredPage(); + if (!page.ValidateUserApp(GetCurrentApp())) + throw new ArgumentException("The current user doesn't have access to this application. Please contact the system administrator."); + + //find all tree definitions that have the current application alias that are ACTIVE + m_ActiveTreeDefs = TreeDefinitionCollection.Instance.FindActiveTrees(GetCurrentApp()); + //find all tree defs that exists for the current application regardless of if they are active + List appTreeDefs = TreeDefinitionCollection.Instance.FindTrees(GetCurrentApp()); + + //Create the BaseTree's based on the tree definitions found + foreach (TreeDefinition treeDef in appTreeDefs) + { + //create the tree and initialize it + BaseTree bTree = treeDef.CreateInstance(); + bTree.SetTreeParameters(m_TreeService); + + //store the created tree + m_AllAppTrees.Add(bTree); + if (treeDef.Tree.Initialize) + m_ActiveTrees.Add(bTree); + } + + m_IsInit = true; + } + + /// + /// This calls the databind method to bind the data binding syntax on the front-end. + /// + /// Databinding was used instead of inline tags in case the tree properties needed to be set + /// by other classes at runtime + /// + /// + /// + /// + /// This will initialize the control so all TreeService properties need to be set before hand + /// + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + + if (!m_IsInit) + Initialize(); + + //Render out the JavaScript associated with all of the trees for the application + RenderTreeJS(); + + //apply the styles + if (Width != Unit.Empty) + TreeContainer.Style.Add( HtmlTextWriterStyle.Width, Width.ToString()); + if (Height != Unit.Empty) + TreeContainer.Style.Add(HtmlTextWriterStyle.Height, Height.ToString()); + if (BackColor != Color.Empty) + TreeContainer.Style.Add(HtmlTextWriterStyle.BackgroundColor, ColorTranslator.ToHtml(BackColor)); + if (CssClass != "") + { + TreeContainer.Attributes.Add("class", CssClass); + } + else + { + //add the default class + TreeContainer.Attributes.Add("class", "treeContainer"); + } + + + DataBind(); + } + + /// + /// Returns the JSON markup for the full context menu + /// + public string GetJSONContextMenu() + { + if (ShowContextMenu) + { + JTreeContextMenu menu = new JTreeContextMenu(); + return menu.RenderJSONMenu(); + } + else + { + return "{}"; + } + + } + + /// + /// Returns the JSON markup for one node + /// + /// + /// + /// + /// + /// This will initialize the control so all TreeService properties need to be set before hand + /// + public string GetJSONNode(string nodeId) + { + if (!m_IsInit) + Initialize(); + + if (string.IsNullOrEmpty(m_TreeService.TreeType)) + { + throw new ArgumentException("The TreeType is not set on the tree service"); + } + + BaseTree tree = m_ActiveTrees.Find( + delegate(BaseTree t) + { + return (t.TreeAlias == m_TreeService.TreeType); + } + ); + return tree.GetSerializedNodeData(nodeId); + } + + /// + /// Returns the JSON markup for the first node in the tree + /// + + public string GetJSONInitNode() + { + if (!m_IsInit) + Initialize(); + + //if there is only one tree to render, we don't want to have a node to hold sub trees, we just want the + //stand alone tree, so we'll just add a TreeType to the TreeService and ensure that the right method gets loaded in tree.aspx + if (m_ActiveTrees.Count == 1) + { + m_TreeService.TreeType = m_ActiveTreeDefs[0].Tree.Alias; + + //convert the menu to a string + //string initActions = (TreeSvc.ShowContextMenu ? Action.ToString(m_ActiveTrees[0].RootNodeActions) : ""); + + //Since there's only 1 tree, render out the tree's RootNode properties + XmlTree xTree = new XmlTree(); + xTree.Add(m_ActiveTrees[0].RootNode); + return xTree.ToString(); + } + else + { + + //If there is more than 1 tree for the application than render out a + //container node labelled with the current application. + XmlTree xTree = new XmlTree(); + XmlTreeNode xNode = XmlTreeNode.CreateRoot(new NullTree(GetCurrentApp())); + xNode.Text = ui.Text("sections", GetCurrentApp(), UmbracoEnsuredPage.CurrentUser); + xNode.Source = m_TreeService.GetServiceUrl(); + xNode.Action = ClientTools.Scripts.OpenDashboard(GetCurrentApp()); + xNode.NodeType = m_TreeService.App.ToLower(); + xNode.NodeID = "-1"; + xNode.Icon = ".sprTreeFolder"; + xTree.Add(xNode); + return xTree.ToString(); + } + } + + + + private void RenderTreeJS() + { + Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "Trees_" + GetCurrentApp(), JSCurrApp, true); + } + + /// + /// Return the current application alias. If neither the TreeType of Application is specified + /// than return the default application. If the Application is null but there is a TreeType then + /// find the application that the tree type is associated with. + /// + private string GetCurrentApp() + { + //if theres an treetype specified but no application + if (string.IsNullOrEmpty(m_TreeService.App) && + !string.IsNullOrEmpty(m_TreeService.TreeType)) + { + TreeDefinition treeDef = TreeDefinitionCollection.Instance.FindTree(m_TreeService.TreeType); + if (treeDef != null) + return treeDef.App.alias; + } + else if (!string.IsNullOrEmpty(m_TreeService.App)) + return m_TreeService.App; + + //if everything is null then return the default app + return DEFAULT_APP; + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs similarity index 89% rename from umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs rename to umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs index 9c42afc877..c27bd96968 100644 --- a/umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs +++ b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3603 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace umbraco.presentation.umbraco.controls { +namespace umbraco.controls.Tree { public partial class TreeControl { @@ -138,5 +138,14 @@ namespace umbraco.presentation.umbraco.controls { /// To modify move field declaration from designer file to code-behind file. /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude10; + + /// + /// TreeContainer control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl TreeContainer; } } diff --git a/umbraco/presentation/umbraco/controls/TreeControl.ascx.cs b/umbraco/presentation/umbraco/controls/TreeControl.ascx.cs deleted file mode 100644 index ce291ac1d5..0000000000 --- a/umbraco/presentation/umbraco/controls/TreeControl.ascx.cs +++ /dev/null @@ -1,383 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.Script.Serialization; -using umbraco.interfaces; -using System.Text.RegularExpressions; -using umbraco.BusinessLogic.Actions; -using umbraco.businesslogic.Utils; -using System.Text; -using umbraco.cms.presentation.Trees; -using umbraco.BasePages; -using System.Web.Services; - -namespace umbraco.presentation.umbraco.controls -{ - - /// - /// The Umbraco tree control. - /// If this control doesn't exist on an UmbracoEnsuredPage it will not work. - /// - public partial class TreeControl : System.Web.UI.UserControl - { - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - EnableViewState = false; - } - - public enum TreeMode - { - Standard, Checkbox, InheritedCheckBox - } - - /// - /// If there is not application or tree specified in a query string then this is the application to load. - /// - private const string DEFAULT_APP = "content"; - - private List m_ActiveTrees = new List(); - private List m_AllAppTrees = new List(); - private List m_ActiveTreeDefs = null; - private TreeMode m_TreeType = TreeMode.Standard; - private bool m_IsInit = false; - private TreeService m_TreeService = null; - - /// - /// returns the current tree service being used to render the tree - /// - public TreeService TreeSvc - { - get - { - return m_TreeService; - } - } - - /// - /// Can be set explicitly which will override what is in query strings. - /// Useful for rendering out a tree dynamically. - /// - public void SetTreeService(TreeService srv) - { - m_TreeService = srv; - Initialize(); - } - - /// - /// Allows for checkboxes to be used with the tree. Default is standard. - /// - public TreeMode TreeType - { - get - { - return m_TreeType; - } - set - { - m_TreeType = value; - } - } - - /// - /// Used to create a different container id for the tree control. This is done so that - /// there is a way to differentiate between multiple trees if required. This is currently used - /// to distinguish which tree is the main umbraco tree as opposed to dialog trees. - /// - public string CustomContainerId { get; set; } - - protected void Initialize() - { - //use the query strings if the TreeParams isn't explicitly set - if (m_TreeService == null) - { - TreeRequestParams treeParams = TreeRequestParams.FromQueryStrings(); - m_TreeService = new TreeService() - { - ShowContextMenu = treeParams.ShowContextMenu, - IsDialog = treeParams.IsDialog, - DialogMode = treeParams.DialogMode, - App = treeParams.Application, - TreeType = treeParams.TreeType - }; - } - - //ensure that the application is setup correctly - m_TreeService.App = CurrentApp; - - // Validate permissions - if (!BasePages.BasePage.ValidateUserContextID(BasePages.BasePage.umbracoUserContextID)) - return; - UmbracoEnsuredPage page = new UmbracoEnsuredPage(); - if (!page.ValidateUserApp(TreeSvc.App)) - throw new ArgumentException("The current user doesn't have access to this application. Please contact the system administrator."); - - //find all tree definitions that have the current application alias that are ACTIVE - m_ActiveTreeDefs = TreeDefinitionCollection.Instance.FindActiveTrees(TreeSvc.App); - //find all tree defs that exists for the current application regardless of if they are active - List appTreeDefs = TreeDefinitionCollection.Instance.FindTrees(TreeSvc.App); - - //Create the BaseTree's based on the tree definitions found - foreach (TreeDefinition treeDef in appTreeDefs) - { - //create the tree and initialize it - BaseTree bTree = treeDef.CreateInstance(); - bTree.SetTreeParameters(TreeSvc); - - //store the created tree - m_AllAppTrees.Add(bTree); - if (treeDef.Tree.Initialize) - m_ActiveTrees.Add(bTree); - } - - m_IsInit = true; - } - - /// - /// This calls the databind method to bind the data binding syntax on the front-end. - /// - /// Databinding was used instead of inline tags in case the tree properties needed to be set - /// by other classes at runtime - /// - /// - /// - protected override void OnPreRender(EventArgs e) - { - base.OnPreRender(e); - - if (!m_IsInit) - Initialize(); - - //Render out the JavaScript associated with all of the trees for the application - RenderTreeJS(); - - DataBind(); - } - - /// - /// Returns the JSON markup for the full context menu - /// - public string GetJSONContextMenu() - { - JTreeContextMenu menu = new JTreeContextMenu(); - return menu.RenderJSONMenu(); - } - - /// - /// Returns the JSON markup for one node - /// - /// - /// - /// - public string GetJSONNode(string nodeId) - { - if (!m_IsInit) - Initialize(); - - if (string.IsNullOrEmpty(TreeSvc.TreeType)) - { - throw new ArgumentException("The TreeType is not set on the tree service"); - } - - BaseTree tree = m_ActiveTrees.Find( - delegate(BaseTree t) - { - return (t.TreeAlias == TreeSvc.TreeType); - } - ); - return tree.GetSerializedNodeData(nodeId); - } - - /// - /// Returns the JSON markup for the first node in the tree - /// - public string GetJSONInitNode() - { - if (!m_IsInit) - Initialize(); - - //if there is only one tree to render, we don't want to have a node to hold sub trees, we just want the - //stand alone tree, so we'll just add a TreeType to the TreeService and ensure that the right method gets loaded in tree.aspx - if (m_ActiveTrees.Count == 1) - { - TreeSvc.TreeType = m_ActiveTreeDefs[0].Tree.Alias; - - //convert the menu to a string - //string initActions = (TreeSvc.ShowContextMenu ? Action.ToString(m_ActiveTrees[0].RootNodeActions) : ""); - - //Since there's only 1 tree, render out the tree's RootNode properties - XmlTree xTree = new XmlTree(); - xTree.Add(m_ActiveTrees[0].RootNode); - return xTree.ToString(); - } - else - { - - //If there is more than 1 tree for the application than render out a - //container node labelled with the current application. - XmlTree xTree = new XmlTree(); - XmlTreeNode xNode = XmlTreeNode.CreateRoot(new NullTree(CurrentApp)); - xNode.Text = ui.Text("sections", TreeSvc.App, UmbracoEnsuredPage.CurrentUser); - xNode.Source = TreeSvc.GetServiceUrl(); - xNode.Action = ClientTools.Scripts.OpenDashboard(TreeSvc.App); - xNode.NodeType = TreeSvc.App.ToLower(); - xNode.NodeID = "-1"; - xNode.Icon = ".sprTreeFolder"; - xTree.Add(xNode); - return xTree.ToString(); - } - } - - /// - /// Returns the requires JavaScript as a string for the current application - /// - public string JSCurrApp - { - get - { - StringBuilder javascript = new StringBuilder(); - foreach (BaseTree bTree in m_AllAppTrees) - bTree.RenderJS(ref javascript); - return javascript.ToString(); - } - } - - /// - /// Return the current application alias. If neither the TreeType of Application is specified - /// than return the default application. If the Application is null but there is a TreeType then - /// find the application that the tree type is associated with. - /// - protected string CurrentApp - { - get - { - //if theres an treetype specified but no application - if (string.IsNullOrEmpty(TreeSvc.App) && - !string.IsNullOrEmpty(TreeSvc.TreeType)) - { - TreeDefinition treeDef = TreeDefinitionCollection.Instance.FindTree(TreeSvc.TreeType); - if (treeDef != null) - return treeDef.App.alias; - } - else if (!string.IsNullOrEmpty(TreeSvc.App)) - return TreeSvc.App; - - //if everything is null then return the default app - return DEFAULT_APP; - } - } - - private void RenderTreeJS() - { - Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "Trees", JSCurrApp, true); - } - - - } - - internal class JTreeContextMenu - { - public string RenderJSONMenu() - { - - JSONSerializer jSSerializer = new JSONSerializer(); - - jSSerializer.RegisterConverters(new List() - { - new JTreeContextMenuItem() - }); - - List allActions = new List(); - foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll()) - { - if (!string.IsNullOrEmpty(a.Alias) && (!string.IsNullOrEmpty(a.JsFunctionName) || !string.IsNullOrEmpty(a.JsSource))) - { - allActions.Add(a); - } - - } - - - return jSSerializer.Serialize(allActions); - } - } - - internal class JTreeContextMenuItem : JavaScriptConverter - { - - /// - /// Not implemented as we never need to Deserialize - /// - /// - /// - /// - /// - public override object Deserialize(IDictionary dictionary, Type type, JavaScriptSerializer serializer) - { - throw new NotImplementedException(); - } - - public override IDictionary Serialize(object obj, JavaScriptSerializer serializer) - { - //{ - // "id": "L", - // "label": "Create", - // "icon": "create.png", - // "visible": function(NODE, TREE_OBJ) { if (NODE.length != 1) return false; return TREE_OBJ.check("creatable", NODE); }, - // "action": function(NODE, TREE_OBJ) { TREE_OBJ.create(false, NODE); }, - //} - - - IAction a = (IAction)obj; - Dictionary data = new Dictionary(); - - data.Add("id", a.Letter); - data.Add("label", ui.Text(a.Alias)); - - if (a.Icon.StartsWith(".")) - { - StringBuilder sb = new StringBuilder(); - sb.Append(string.Format("
", a.Icon.TrimStart('.'))); - sb.Append("
"); - sb.Append("
"); - sb.Append(data["label"].ToString()); - sb.Append("
"); - data["label"] = sb.ToString(); - } - else - { - data.Add("icon", a.Icon); - } - - //required by jsTree - data.Add("visible", JSONSerializer.ToJSONObject("function() {return true;}")); - //The action handler is what is assigned to the IAction, but for flexibility, we'll call our onContextMenuSelect method which will need to return true if the function is to execute. - //TODO: Check if there is a JSSource - data.Add("action", JSONSerializer.ToJSONObject("function(N,T){" + a.JsFunctionName + ";}")); - - return data; - - } - - /// - /// TODO: Find out why we can't just return IAction as one type (JavaScriptSerializer doesn't seem to pick up on it) - /// - public override IEnumerable SupportedTypes - { - get - { - List types = new List(); - foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll()) - { - types.Add(a.GetType()); - } - return types; - } - - - } - } -} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/create/content.ascx b/umbraco/presentation/umbraco/create/content.ascx index 49ae2745b7..da1a385f02 100644 --- a/umbraco/presentation/umbraco/create/content.ascx +++ b/umbraco/presentation/umbraco/create/content.ascx @@ -19,7 +19,7 @@
or - <%=umbraco.ui.Text("cancel")%> + <%=umbraco.ui.Text("cancel")%> - - - - - - - - - + + - - + + - - -
-
- -
- -
- - -
- - -
+ <%--when a node is selected, the id will be stored in this field--%> + + + + +
+ + + - + -
-

- or - {#cancel} -

- - - - - - +

+ " style="width: 60px; + color: gray" disabled="disabled" id="submitbutton" /> + + <%# umbraco.ui.Text("or") %> + <%#umbraco.ui.Text("cancel") %> +

+ diff --git a/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.cs b/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.cs index 2e70346438..0b30058780 100644 --- a/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.cs +++ b/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.cs @@ -4,15 +4,16 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using umbraco.BasePages; namespace umbraco.presentation.umbraco.dialogs { - public partial class mediaPicker : System.Web.UI.Page + public partial class mediaPicker : UmbracoEnsuredPage { protected void Page_Load(object sender, EventArgs e) { - - + if (!IsPostBack) + DataBind(); } diff --git a/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs index 411be9c340..82c08429dd 100644 --- a/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -13,78 +13,6 @@ namespace umbraco.presentation.umbraco.dialogs { public partial class mediaPicker { - /// - /// Head1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - - /// - /// CssInclude1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.CssInclude CssInclude1; - - /// - /// JsInclude1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; - - /// - /// JsInclude3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude3; - - /// - /// JsInclude4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude4; - - /// - /// JsInclude2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude2; - - /// - /// ClientLoader control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader; - - /// - /// Form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm Form1; - /// /// pane_src control. /// @@ -94,6 +22,15 @@ namespace umbraco.presentation.umbraco.dialogs { /// protected global::umbraco.uicontrols.Pane pane_src; + /// + /// ImageViewer control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Images.ImageViewer ImageViewer; + /// /// tv_options control. /// @@ -112,6 +49,15 @@ namespace umbraco.presentation.umbraco.dialogs { /// protected global::umbraco.uicontrols.Pane pane_select; + /// + /// DialogTree control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Tree.TreeControl DialogTree; + /// /// pane_upload control. /// @@ -120,5 +66,14 @@ namespace umbraco.presentation.umbraco.dialogs { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pane_upload; + + /// + /// MediaUploader control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Images.UploadMediaImage MediaUploader; } } diff --git a/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx b/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx index 79988c6adc..9fc2e74da6 100644 --- a/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx +++ b/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx @@ -1,6 +1,8 @@ <%@ Page Language="c#" CodeBehind="moveOrCopy.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.dialogs.moveOrCopy" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %> + @@ -51,8 +44,10 @@ function doSubmit() {document.Form1["ok"].click()} - - + + @@ -76,7 +71,7 @@ function doSubmit() {document.Form1["ok"].click()}

  - <%=umbraco.ui.Text("general", "or", this.getUser())%>   + <%=umbraco.ui.Text("general", "or", this.getUser())%>   <%=umbraco.ui.Text("general", "cancel", this.getUser())%>

diff --git a/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.cs b/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.cs index efe7acde80..9658147453 100644 --- a/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.cs +++ b/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.cs @@ -24,6 +24,8 @@ namespace umbraco.dialogs protected void Page_Load(object sender, System.EventArgs e) { + JTree.DataBind(); + // Put user code to initialize the page here if (!IsPostBack) { //Document Type copy Hack... @@ -259,7 +261,7 @@ namespace umbraco.dialogs m.Move(int.Parse(UmbracoContext.Current.Request["copyTo"])); } - feedback.Text = ui.Text("moveOrCopy", "moveDone", nodes, base.getUser()) + "

" + ui.Text("closeThisWindow") + ""; + feedback.Text = ui.Text("moveOrCopy", "moveDone", nodes, base.getUser()) + "

" + ui.Text("closeThisWindow") + ""; feedback.type = umbraco.uicontrols.Feedback.feedbacktype.success; // refresh tree @@ -270,7 +272,7 @@ namespace umbraco.dialogs { cms.businesslogic.web.Document d = new cms.businesslogic.web.Document(int.Parse(helper.Request("id"))); d.Copy(int.Parse(helper.Request("copyTo")), this.getUser(), RelateDocuments.Checked); - feedback.Text = ui.Text("moveOrCopy", "copyDone", nodes, base.getUser()) + "

" + ui.Text("closeThisWindow") + ""; + feedback.Text = ui.Text("moveOrCopy", "copyDone", nodes, base.getUser()) + "

" + ui.Text("closeThisWindow") + ""; feedback.type = umbraco.uicontrols.Feedback.feedbacktype.success; ClientTools.CopyNode(currentNode.Id.ToString(), newNode.Path); } diff --git a/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.designer.cs index c08ac1b7ef..334f79a404 100644 --- a/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/moveOrCopy.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -40,6 +40,15 @@ namespace umbraco.dialogs { /// protected global::umbraco.uicontrols.Pane pane_form; + ///

+ /// JTree control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Tree.TreeControl JTree; + /// /// pp_relate control. /// diff --git a/umbraco/presentation/umbraco/dialogs/notifications.aspx b/umbraco/presentation/umbraco/dialogs/notifications.aspx index 26ed4f2c40..34e586dcac 100644 --- a/umbraco/presentation/umbraco/dialogs/notifications.aspx +++ b/umbraco/presentation/umbraco/dialogs/notifications.aspx @@ -18,7 +18,7 @@
-  <%= umbraco.ui.Text("or") %>  <%=umbraco.ui.Text("cancel")%> +  <%= umbraco.ui.Text("or") %>  <%=umbraco.ui.Text("cancel")%> \ No newline at end of file diff --git a/umbraco/presentation/umbraco/dialogs/notifications.aspx.cs b/umbraco/presentation/umbraco/dialogs/notifications.aspx.cs index cf14caff27..7e7b18bdc1 100644 --- a/umbraco/presentation/umbraco/dialogs/notifications.aspx.cs +++ b/umbraco/presentation/umbraco/dialogs/notifications.aspx.cs @@ -88,7 +88,7 @@ namespace umbraco.dialogs base.getUser().initNotifications(); - feedback.Text = ui.Text("notifications") + " " + ui.Text("ok") + "

" + ui.Text("closeThisWindow") + ""; + feedback.Text = ui.Text("notifications") + " " + ui.Text("ok") + "

" + ui.Text("closeThisWindow") + ""; feedback.type = umbraco.uicontrols.Feedback.feedbacktype.success; pane_form.Visible = false; diff --git a/umbraco/presentation/umbraco/dialogs/notifications.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/notifications.aspx.designer.cs index a7e5247068..15ce3d33b1 100644 --- a/umbraco/presentation/umbraco/dialogs/notifications.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/notifications.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.1433 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/dialogs/protectPage.aspx b/umbraco/presentation/umbraco/dialogs/protectPage.aspx index c2fce75921..19edd39dfc 100644 --- a/umbraco/presentation/umbraco/dialogs/protectPage.aspx +++ b/umbraco/presentation/umbraco/dialogs/protectPage.aspx @@ -103,7 +103,7 @@

-   <%= umbraco.ui.Text("or") %>  <%=umbraco.ui.Text("cancel")%> +   <%= umbraco.ui.Text("or") %>  <%=umbraco.ui.Text("cancel")%>

@@ -153,7 +153,7 @@

-   <%= umbraco.ui.Text("or") %>  <%=umbraco.ui.Text("cancel")%> +   <%= umbraco.ui.Text("or") %>  <%=umbraco.ui.Text("cancel")%>

diff --git a/umbraco/presentation/umbraco/dialogs/protectPage.aspx.cs b/umbraco/presentation/umbraco/dialogs/protectPage.aspx.cs index 49ef5bb351..104936d3a7 100644 --- a/umbraco/presentation/umbraco/dialogs/protectPage.aspx.cs +++ b/umbraco/presentation/umbraco/dialogs/protectPage.aspx.cs @@ -229,7 +229,7 @@ namespace umbraco.presentation.umbraco.dialogs cms.businesslogic.web.Access.RemoveMembershipRoleFromDocument(pageId, li.Value); } - feedback.Text = ui.Text("publicAccess", "paIsProtected", new cms.businesslogic.CMSNode(pageId).Text, null) + "

" + ui.Text("closeThisWindow") + ""; + feedback.Text = ui.Text("publicAccess", "paIsProtected", new cms.businesslogic.CMSNode(pageId).Text, null) + "

" + ui.Text("closeThisWindow") + ""; ClientTools.ReloadActionNode(true, false); @@ -247,7 +247,7 @@ namespace umbraco.presentation.umbraco.dialogs Access.RemoveProtection(pageId); - feedback.Text = ui.Text("publicAccess", "paIsRemoved", new cms.businesslogic.CMSNode(pageId).Text, null) + "

" + ui.Text("closeThisWindow") + ""; + feedback.Text = ui.Text("publicAccess", "paIsRemoved", new cms.businesslogic.CMSNode(pageId).Text, null) + "

" + ui.Text("closeThisWindow") + ""; ClientTools.ReloadActionNode(true, false); diff --git a/umbraco/presentation/umbraco/dialogs/protectPage.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/protectPage.aspx.designer.cs index 7e04e5fa26..6ed66eea24 100644 --- a/umbraco/presentation/umbraco/dialogs/protectPage.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/protectPage.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.1433 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/dialogs/publish.aspx b/umbraco/presentation/umbraco/dialogs/publish.aspx index 2246da7ace..acd3e6e856 100644 --- a/umbraco/presentation/umbraco/dialogs/publish.aspx +++ b/umbraco/presentation/umbraco/dialogs/publish.aspx @@ -85,7 +85,7 @@

- <%= umbraco.ui.Text("general","or") %> <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%= umbraco.ui.Text("general","or") %> <%=umbraco.ui.Text("general", "cancel", this.getUser())%>
diff --git a/umbraco/presentation/umbraco/dialogs/sort.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/sort.aspx.designer.cs index 496c4cbe4e..3287cd1289 100644 --- a/umbraco/presentation/umbraco/dialogs/sort.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/sort.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3603 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/dialogs/treePicker.aspx b/umbraco/presentation/umbraco/dialogs/treePicker.aspx index c55dd1a64b..b782dc3412 100644 --- a/umbraco/presentation/umbraco/dialogs/treePicker.aspx +++ b/umbraco/presentation/umbraco/dialogs/treePicker.aspx @@ -1,89 +1,23 @@ -<%@ Page Language="c#" Codebehind="treePicker.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.treePicker" %> +<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="treePicker.aspx.cs" + AutoEventWireup="True" Inherits="umbraco.dialogs.treePicker" %> + <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="umb2" TagName="Tree" Src="../controls/Tree/TreeControl.ascx" %> + + + + - - - - - umbraco - - - - - + - - - - - -
- -
- -
-
- - + + + diff --git a/umbraco/presentation/umbraco/dialogs/treePicker.aspx.cs b/umbraco/presentation/umbraco/dialogs/treePicker.aspx.cs index 12bdf6ab47..c1f29d9c0e 100644 --- a/umbraco/presentation/umbraco/dialogs/treePicker.aspx.cs +++ b/umbraco/presentation/umbraco/dialogs/treePicker.aspx.cs @@ -12,42 +12,17 @@ using umbraco.cms.presentation.Trees; namespace umbraco.dialogs { - /// - /// Summary description for treePicker. - /// + [Obsolete("Use the TreeControl instead. This does however get used by the TreeService when requesting the tree init url.")] public partial class treePicker : BasePages.UmbracoEnsuredPage { protected override void OnLoad(EventArgs e) { base.OnLoad(e); - ClientLoader.DataBind(); + TreeParams = TreeRequestParams.FromQueryStrings().CreateTreeService(); + DataBind(); } - protected string TreeInitUrl - { - get - { - TreeRequestParams treeParams = TreeRequestParams.FromQueryStrings(); + protected TreeService TreeParams { get; private set; } - return TreeService.GetInitUrl(null, treeParams.TreeType, false, true, TreeDialogModes.id, treeParams.Application, "", ""); - } - } - - - #region Web Form Designer generated code - override protected void OnInit(EventArgs e) - { - InitializeComponent(); - base.OnInit(e); - } - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - } - #endregion } } diff --git a/umbraco/presentation/umbraco/dialogs/treePicker.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/treePicker.aspx.designer.cs index 69875cb8f7..547394a509 100644 --- a/umbraco/presentation/umbraco/dialogs/treePicker.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/treePicker.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3603 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -14,21 +14,12 @@ namespace umbraco.dialogs { public partial class treePicker { /// - /// ClientLoader control. + /// DialogTree control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader; - - /// - /// JsInclude1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + protected global::umbraco.controls.Tree.TreeControl DialogTree; } } diff --git a/umbraco/presentation/umbraco/dialogs/umbracoField.aspx b/umbraco/presentation/umbraco/dialogs/umbracoField.aspx index 53b7fb5e44..0d9f7c529d 100644 --- a/umbraco/presentation/umbraco/dialogs/umbracoField.aspx +++ b/umbraco/presentation/umbraco/dialogs/umbracoField.aspx @@ -67,7 +67,7 @@ UmbClientMgr.contentFrame().UmbEditor.Insert(tagString, '', '<%=umbraco.helper.Request("objectId")%>'); - UmbClientMgr.mainWindow().closeModal(); + UmbClientMgr.closeModalWindow(); } var functionsFrame = this; @@ -169,6 +169,6 @@
" onclick="doSubmit()">   or   - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=umbraco.ui.Text("general", "cancel", this.getUser())%> \ No newline at end of file diff --git a/umbraco/presentation/umbraco/dialogs/umbracoField.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/umbracoField.aspx.designer.cs index 558b59f883..fc13b548da 100644 --- a/umbraco/presentation/umbraco/dialogs/umbracoField.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/umbracoField.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/dialogs/uploadImage.aspx b/umbraco/presentation/umbraco/dialogs/uploadImage.aspx index 08354e4202..f72dba32d0 100644 --- a/umbraco/presentation/umbraco/dialogs/uploadImage.aspx +++ b/umbraco/presentation/umbraco/dialogs/uploadImage.aspx @@ -1,66 +1,28 @@ -<%@ Page language="c#"MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="uploadImage.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.uploadImage" %> +<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="uploadImage.aspx.cs" + AutoEventWireup="True" Inherits="umbraco.dialogs.uploadImage" %> + <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - +<%@ Register TagName="MediaUpload" TagPrefix="umb" Src="../controls/Images/UploadMediaImage.ascx" %> + - - var imageName = tb_image.value; - if (imageName.length > 0) { - var extension = imageName.substring(imageName.lastIndexOf(".") + 1, imageName.length); - if (imageTypes.indexOf(',' + extension.toLowerCase() + ',') > -1) { - bt_submit.disabled = false; - if(tb_title.value == "") - tb_title.value = imageName.substring(imageName.lastIndexOf("\\") + 1, imageName.length).replace("." + extension, ""); - } - } - } - - function chooseId() { - var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"media","media")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no') - if (treePicker != undefined) { - document.getElementById("ctl00_body_folderid").value = treePicker; - if (treePicker > 0) { - umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateContentTitle); - } - } - } - function updateContentTitle(result) { - document.getElementById("mediaTitle").innerHTML = "" + result + ""; - } - - - - - - - - - - - - - - - - - - - - - + - \ No newline at end of file diff --git a/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.cs b/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.cs index b729ba93d6..8c3defc8a0 100644 --- a/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.cs +++ b/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.cs @@ -14,95 +14,9 @@ using umbraco.IO; namespace umbraco.dialogs { - /// - /// Summary description for uploadImage. - /// + [Obsolete("Use the UploadMediaImage control instead")] public partial class uploadImage : BasePages.UmbracoEnsuredPage { - protected controls.ContentPicker mediaPickerControl = new umbraco.controls.ContentPicker(); - - protected interfaces.IDataType uploadField = new cms.businesslogic.datatype.controls.Factory().GetNewObject(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); - - protected void Page_Load(object sender, System.EventArgs e) - { - //uploadField.Alias = "umbracoFile"; - ((HtmlInputFile) uploadField.DataEditor).Attributes.Add("onChange", "validateImage()"); - ((HtmlInputFile) uploadField.DataEditor).ID = "uploadFile"; - - mediaPickerControl.ID = "mediaPickerControl"; - mediaPickerControl.AppAlias = "media"; - mediaPickerControl.TreeAlias = "media"; - mediaPickerControl.ModalHeight = 200; - mediaPickerControl.ShowDelete = false; - mediaPickerControl.Text = this.getUser().StartMediaId.ToString(); - mediaPicker.Controls.Add(mediaPickerControl); - - if (!IsPostBack) - { - Button1.Text = ui.Text("save"); - //LiteralTitle.Text = ui.Text("name"); - //LiteralUpload.Text = ui.Text("choose"); - } - else - { - - cms.businesslogic.media.Media m = cms.businesslogic.media.Media.MakeNew(TextBoxTitle.Text, cms.businesslogic.media.MediaType.GetByAlias("image"), this.getUser(), int.Parse(mediaPickerControl.Text)); - var props = m.getProperties; - foreach (cms.businesslogic.property.Property p in props) { - if (p.PropertyType.DataTypeDefinition.DataType.Id == uploadField.Id) - { - uploadField.DataTypeDefinitionId = p.PropertyType.DataTypeDefinition.Id; - uploadField.Data.PropertyId = p.Id; - } - } - uploadField.DataEditor.Save(); - - // Generate xml on image - m.XmlGenerate(new XmlDocument()); - pane_upload.Visible = false; - - string imagename = m.getProperty("umbracoFile").Value.ToString(); - string extension = imagename.Substring(imagename.LastIndexOf(".") + 1, imagename.Length - imagename.LastIndexOf(".") -1); - - imagename = imagename.Remove(imagename.Length-extension.Length-1,extension.Length+1) + "_thumb.jpg"; - - feedback.Style.Add("margin-top", "8px"); - feedback.type = umbraco.uicontrols.Feedback.feedbacktype.success; - feedback.Text += ""; - - feedback.Text += ""; - - } - // Put user code to initialize the page here - } - - #region Web Form Designer generated code - override protected void OnInit(EventArgs e) - { - // - // CODEGEN: This call is required by the ASP.NET Web Form Designer. - // - InitializeComponent(); - base.OnInit(e); - - // Get upload field from datafield factory - PlaceHolder1.Controls.Add((Control) uploadField.DataEditor); - } - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - - } - #endregion - - protected void Button1_Click(object sender, System.EventArgs e) - { - - } + } } diff --git a/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.designer.cs index 7075f582af..b34a3851bf 100644 --- a/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.designer.cs +++ b/umbraco/presentation/umbraco/dialogs/uploadImage.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -14,93 +14,12 @@ namespace umbraco.dialogs { public partial class uploadImage { /// - /// pane_upload control. + /// MediaUploader control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::umbraco.uicontrols.Pane pane_upload; - - /// - /// pp_name control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel pp_name; - - /// - /// TextBoxTitle control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox TextBoxTitle; - - /// - /// pp_file control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel pp_file; - - /// - /// PlaceHolder1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; - - /// - /// pp_target control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel pp_target; - - /// - /// mediaPicker control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder mediaPicker; - - /// - /// pp_button control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel pp_button; - - /// - /// Button1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button Button1; - - /// - /// feedback control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Feedback feedback; + protected global::umbraco.controls.Images.UploadMediaImage MediaUploader; } } diff --git a/umbraco/presentation/umbraco/images/throbber.gif b/umbraco/presentation/umbraco/images/throbber.gif new file mode 100644 index 0000000000000000000000000000000000000000..95ff649d4162b61d8107adb91ded5940c55e5e4c GIT binary patch literal 1844 zcmb8wYfw{X8VB&hIq%6iIhW)mA`M8L5P~KlG2s@XSob7=AW#Zaq2*E%FqBZJfr`); zkz5dhT$O6^QnjT8MO#30dIMu*M%#|A%sTD#HlrO{wY4p*+gY9IuA49mlMnl4pO4Rn z_x;WPd7pXHw`|t0H$wy>|3Hw(j~{a!_u#>U;o;#sckb-mx%0@8BfgH^ZZ9e-@_0Pg zuV2r}$(fv-G#ZUnRaM>H-N^q_k^f%#w0XNlQvRyMP;G9?-eKOp&iZoY4kYpsKq%iy zk&o$|w5`vk7;@9%)@iXIUrXh`!0$uwMu`MP`H?@4ps7akilJ{bBf@>_s`rfO+$HlE z_Fk&P3xDDyFI)&Q+D0D-t5Ep7fgL^^iyWBJy&O)R%{5h*T2g>V_})by$5BvGMU@al2va{GSn|) zut3aWE?+13Fs?{4V?p|bQq;SOzLD3f;hf_gY5^446Ivm_FQ2l(1VLAR%s)R>i-_ZQ z&)d$DSBFirx$=WL(s}#DvGDnAnm;9cl2)pKO93!>jHXmt^Gus&uhQ^R|DFS#bk;yu zXQ`n@r#qor$^`^cY8FQ%_U9rcuPm(gQQBA0%+xf3slU`~Gl0l3-uhHd@=4~#=fPWD zY4>lysnGXV{#LgVhTk3fb=>k6^YgYHS#f2BMSuUktH3=OTm51ouy8vYGBlb-(_h-$ zl`T>G-3N682cnh$cp#v~5BNys1309lb0K_2N$pK$Z29M+QP)_MmN#_RbW-98UwgS? zP(Boj4P9v56UqUqayN2-d{sv%3*41~dbPL50LqF%%JdK+R7xC!#fqWeXW-SxiQ8bZ+FW zwT7cvr}lqv>zi)X+ZX;N00-P@CGr~Q(Nk-Z6D8fZV4^71JrmZdy}SBcyu*A(s}}8B z*>_$YA((ygq(?jedM-O{83`c}FW|#y)`}6BP)ON|^QFyvv{Weq4FU6?`ljcAY4=EKQf?Yl7+^t|3)Zc4cK^3ZD9J7O$H9Oa)hMNH$W z@k=*@!>0RBjDHb2eQm|uteh_*u1<|TDFHOei>5YV1WV#HL&YfpAw)Y-p3thK`5GMG z00(1a7`AI!Lj`IY{I6y)o0{U&vfI=|Caf!d$6Lq551R6d9|{sz*dJ~P6Lh{Y54JoP zsrA$wQuSgcW!GrmXCe4^8M&3#;ORLlk~aW)orYY_whE^3*yvP*&E-KL%uCQQxDUfx zE37CabE>tCtV^-HQgonXc}nY;y6F*0m5$QyXF{Z2{y{`$pPnJxQ|9NC!JX}UjgzXu z@Se7x*N8V#ZT7CoZ^J}Y<4j?T8h+YunpN?c_Je;6iB;EeXQPV7+Th06 dtwLDJL#a0_K>wk&Y~4#Tit}rd{U6a{{Rfg56CMBn literal 0 HcmV?d00001 diff --git a/umbraco/presentation/umbraco/masterpages/umbracoPage.Master b/umbraco/presentation/umbraco/masterpages/umbracoPage.Master index 228c94ba3e..d4c5768a77 100644 --- a/umbraco/presentation/umbraco/masterpages/umbracoPage.Master +++ b/umbraco/presentation/umbraco/masterpages/umbracoPage.Master @@ -13,14 +13,15 @@ + - + - +
diff --git a/umbraco/presentation/umbraco/masterpages/umbracoPage.Master.designer.cs b/umbraco/presentation/umbraco/masterpages/umbracoPage.Master.designer.cs index e6fc35e47b..eac20e90a5 100644 --- a/umbraco/presentation/umbraco/masterpages/umbracoPage.Master.designer.cs +++ b/umbraco/presentation/umbraco/masterpages/umbracoPage.Master.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -40,6 +40,15 @@ namespace umbraco.presentation.umbraco.masterpages { /// protected global::ClientDependency.Core.Controls.CssInclude CssInclude1; + /// + /// CssInclude2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.CssInclude CssInclude2; + /// /// JsInclude1 control. /// @@ -58,6 +67,15 @@ namespace umbraco.presentation.umbraco.masterpages { /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude2; + /// + /// JsInclude8 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude8; + /// /// JsInclude4 control. /// @@ -85,6 +103,15 @@ namespace umbraco.presentation.umbraco.masterpages { /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude6; + /// + /// JsInclude7 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude7; + /// /// JsInclude3 control. /// diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx b/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx index 3b95c2afef..70f0808de4 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx @@ -1,37 +1,58 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="insertImage.aspx.cs" Inherits="umbraco.presentation.plugins.tinymce3.insertImage" %> <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> +<%@ 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" %> {#advimage_dlg.dialog_title} - - + <%----%> + + + + + + - - - - + + @@ -111,14 +136,15 @@ - - + + + + + -
-   -
+ @@ -137,382 +163,24 @@ +
- - + +
- +

- or {#cancel} + or {#cancel}

- - - - - - diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.cs b/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.cs index 258a1cbc13..e81484bf3d 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.cs +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.cs @@ -29,14 +29,10 @@ namespace umbraco.presentation.plugins.tinymce3 uicontrols.TabPage tp = tv_options.NewTabPage(ui.Text("choose")); tp.HasMenu = false; tp.Controls.Add(pane_select); - - //tp.Controls.Add(new LiteralControl("
 
")); - + uicontrols.TabPage tp2 = tv_options.NewTabPage(ui.Text("create") + " " + ui.Text("new")); tp2.HasMenu = false; tp2.Controls.Add(pane_upload); - - //tp2.Controls.Add(new LiteralControl("")); } #region Web Form Designer generated code diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs b/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs index 4a3e711922..6a882ba0b4 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -31,6 +31,15 @@ namespace umbraco.presentation.plugins.tinymce3 { /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude3; + /// + /// JsInclude9 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude9; + /// /// JsInclude8 control. /// @@ -94,6 +103,24 @@ namespace umbraco.presentation.plugins.tinymce3 { /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + /// + /// Form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm Form1; + + /// + /// ScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.ScriptManager ScriptManager1; + /// /// pane_src control. /// @@ -103,6 +130,15 @@ namespace umbraco.presentation.plugins.tinymce3 { /// protected global::umbraco.uicontrols.Pane pane_src; + /// + /// ImageViewer control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Images.ImageViewer ImageViewer; + /// /// pp_src control. /// @@ -175,6 +211,15 @@ namespace umbraco.presentation.plugins.tinymce3 { /// protected global::umbraco.uicontrols.Pane pane_select; + /// + /// DialogTree control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Tree.TreeControl DialogTree; + /// /// pane_upload control. /// @@ -185,21 +230,12 @@ namespace umbraco.presentation.plugins.tinymce3 { protected global::System.Web.UI.WebControls.Panel pane_upload; /// - /// Table1 control. + /// MediaUploader control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlTable Table1; - - /// - /// PlaceHolder1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + protected global::umbraco.controls.Images.UploadMediaImage MediaUploader; } } diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx b/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx index a75bc97408..dee74da7fa 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx @@ -1,6 +1,8 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="insertLink.aspx.cs" Inherits="umbraco.presentation.plugins.tinymce3.insertLink" %> <%@ 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" %> + @@ -108,13 +110,17 @@
- +
- -
+ +
diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs b/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs index a20670b476..8928f02994 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs @@ -18,15 +18,14 @@ namespace umbraco.presentation.plugins.tinymce3 tp.HasMenu = false; tp.Controls.Add(pane_content); - //tp.Controls.Add(new LiteralControl("")); + uicontrols.TabPage tp2 = tv_options.NewTabPage(ui.Text("media")); tp2.HasMenu = false; tp2.Controls.Add(pane_media); - //tp2.Controls.Add(new LiteralControl("")); - //umbracoLink.Controls.Add(tbv); + } protected override void Render(HtmlTextWriter writer) diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs b/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs index f5b6e963e3..4f43e2a47c 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -121,6 +121,15 @@ namespace umbraco.presentation.plugins.tinymce3 { /// protected global::umbraco.uicontrols.Pane pane_content; + /// + /// TreeControl2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Tree.TreeControl TreeControl2; + /// /// pane_media control. /// @@ -130,6 +139,15 @@ namespace umbraco.presentation.plugins.tinymce3 { /// protected global::umbraco.uicontrols.Pane pane_media; + /// + /// TreeControl1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.controls.Tree.TreeControl TreeControl1; + /// /// umbracoLink control. /// diff --git a/umbraco/presentation/umbraco/plugins/tinymce3/insertMacro.aspx b/umbraco/presentation/umbraco/plugins/tinymce3/insertMacro.aspx index a93e2c6fb4..9f063ef1a2 100644 --- a/umbraco/presentation/umbraco/plugins/tinymce3/insertMacro.aspx +++ b/umbraco/presentation/umbraco/plugins/tinymce3/insertMacro.aspx @@ -7,14 +7,13 @@ {#advlink_dlg.title} - - - -
-
-
-
-
- × -
- -
-
+ +
+
+ +
+
× +
+
+ + "); + this._getContainer().after(""); } return eval(msg.json); } @@ -540,8 +635,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); }, onBeforeRequest: function(NODE, TREE_OBJ) { + this._ensureContext(); + if (TREE_OBJ.settings.data.opts.method == "POST") { - var parameters = "{'app':'" + this._app + "','showContextMenu':'" + this._showContext + "', 'isDialog':'" + this._isDialog + "'}" + var parameters = "{'app':'" + this._app + "','showContextMenu':'" + this._showContext + "', 'isDialog':'" + this._isDialog + "', 'dialogMode':'" + this._dialogMode + "', 'treeType':'" + this._treeType + "', 'functionToCall':'" + this._functionToCall + "', 'nodeKey':'" + this._nodeKey + "'}" return parameters; } else { @@ -571,11 +668,11 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); this._debug("onLoad"); - this._container.show(); + this._getContainer().show(); //ensure the static data is gone this._tree.settings.data.opts.static = null; var _this = this; - _this._loadChildNodes($(_this._container).find("li"), null); + _this._loadChildNodes($(_this._getContainer()).find("li"), null); }, onBeforeMove: function(NODE, REF_NODE, TYPE, TREE_OBJ) { @@ -622,12 +719,18 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); onParse: function(STR, TREE_OBJ) { this._debug("onParse"); + this._ensureContext(); + var obj = $(STR); this._configureNodes(obj); //this will return the full html of the configured node return $('
').append($(obj).clone()).remove().html(); }, + onError: function(ERR, TREE_OBJ) { + this._debug("ERROR!!!!! " + ERR); + }, + _debug: function(strMsg) { if (this._isDebug) { Sys.Debug.trace("UmbracoTree: " + strMsg); @@ -653,7 +756,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); var rxInput = new RegExp("\\boverlay-\\w+\\b", "gi"); nodes.each(function() { //if it is checkbox tree (not standard), don't worry about overlays and remove the default icon. - if (_this._treeType != "standard") { + if (_this._treeMode != "standard") { $(this).children("a:first").css("background", ""); return; } @@ -709,7 +812,14 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); }); } }, - + _ensureContext: function() { + /// + /// ensure that the tree object always has the correct context. + /// this is a fix for the TinyMCE dialog window, as it tends to lose object context for some wacky reason + /// when ajax calls are made. Works fine in all other instances. + /// + this._tree.container = this._getContainer(); + }, _loadChildNodes: function(liNode, callback) { /// jsTree won't allow you to open a node that doesn't explitly have childen, this will force it to try /// a jquery object for the current li node @@ -785,59 +895,6 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); } }, - _init: function(jFullMenu, jInitNode, treeContainer, appActions, uiKeys, app, showContext, isDialog, treeType, serviceUrl, dataUrl, umbClientFolder, recycleBinId) { - /// initialization method, must be called on page ready. - /// JSON markup for the full context menu in accordance with the jsTree context menu object standard - /// JSON markup for the initial node to show - /// the jQuery element to be tree enabled - /// A reference to a MenuActions object - /// A reference to a uiKeys object - /// boolean indicating whether or not to show a context menu - /// boolean indicating whether or not the tree is in dialog mode - /// determines the type of tree: false/null = normal, 'checkbox' = checkboxes enabled, 'inheritedcheckbox' = parent nodes have checks inherited from children - /// Url path for the tree client service - /// Url path for the tree data service - /// Should be set externally!... the root to the umbraco_client folder - /// the id of the recycle bin for the current tree - - this._debug("_init: creating new tree with class/id: " + treeContainer.attr("class") + " / " + treeContainer.attr("id")); - - this._fullMenu = jFullMenu; - this._initNode = jInitNode; - this._appActions = appActions; - this._uiKeys = uiKeys; - this._app = app; - this._showContext = showContext; - this._isDialog = isDialog; - this._treeType = treeType; - this._serviceUrl = serviceUrl; - this._dataUrl = dataUrl; - this._umb_clientFolderRoot = umbClientFolder; - this._recycleBinId = recycleBinId; - - //wire up event handlers - if (this._appActions != null) { - var _this = this; - //wrapped functions maintain scope - this._appActions.addEventHandler("nodeDeleting", function(E) { _this.onNodeDeleting(E) }); - this._appActions.addEventHandler("nodeDeleted", function(E) { _this.onNodeDeleted(E) }); - this._appActions.addEventHandler("nodeRefresh", function(E) { _this.onNodeRefresh(E) }); - } - - //initializes the jsTree - this._container = treeContainer; - this._tree = $.tree.create(); - this._tree.init(this._container, this._getInitOptions()); - //this._tree.rename = this._umbracoRename; //replaces the jsTree rename method - - //add this app to the loaded apps array - //if ($.inArray(app, this._loadedApps) == -1) { - // this._loadedApps.push(app); - //} - - //load child nodes of the init node - //this._loadChildNodes(this._container.find("li:first"), null); - }, // _umbracoRename : function (obj) { // /// A modified version of the original jsTree rename method. We need to use our own since @@ -912,7 +969,9 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); var params = nodeSource.split("?")[1]; return this._dataUrl + "?" + params + "&rnd2=" + Umbraco.Utils.generateRandom(); }, - + _getContainer: function() { + return $("#" + this._containerId, this._context); + }, _getInitOptions: function(initData) { /// return the initialization objects for the tree @@ -937,7 +996,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); rtl: false, animation: false, hover_mode: true, - theme_path: this._umb_clientFolderRoot + "/Tree/Themes/", + theme_path: this._umbClientFolderRoot + "/Tree/Themes/", theme_name: "umbraco" }, langs: { @@ -954,7 +1013,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); onchange: function(N, T) { _this.onChange(N, T); }, ondata: function(D, T) { return _this.onJSONData(D, T); }, onload: function(T) { if (initData == null) _this.onLoad(T); }, - onparse: function(S, T) { return _this.onParse(S, T); } + onparse: function(S, T) { return _this.onParse(S, T); }, + error: function(E, T) { _this.onError(E, T); } }, plugins: { //UmbracoContext comes before context menu so that the events fire first @@ -965,7 +1025,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); contextmenu: {} } }; - if (this._treeType != "standard") { + if (this._treeMode != "standard") { options.plugins.checkbox = { three_state: false } } @@ -980,4 +1040,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); }; } + + // instance manager + Umbraco.Controls.UmbracoTree.cntr = 0; + Umbraco.Controls.UmbracoTree.inst = {}; + + })(jQuery); diff --git a/umbraco/presentation/umbraco_client/Tree/tree_component.js b/umbraco/presentation/umbraco_client/Tree/tree_component.js deleted file mode 100644 index 0d201cd213..0000000000 --- a/umbraco/presentation/umbraco_client/Tree/tree_component.js +++ /dev/null @@ -1,2315 +0,0 @@ -/* - * jsTree 0.9.8 - * http://jstree.com/ - * - * Copyright (c) 2009 Ivan Bozhanov (vakata.com) - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Date: 2009-05-15 - * - */ - -(function($) { - // jQuery plugin - $.fn.tree = function (opts) { - return this.each(function() { - var conf = $.extend({},opts); - if(tree_component.inst && tree_component.inst[$(this).attr('id')]) tree_component.inst[$(this).attr('id')].destroy(); - if(conf !== false) new tree_component().init(this, conf); - }); - }; - $.tree_create = function() { - return new tree_component(); - }; - $.tree_focused = function() { - return tree_component.inst[tree_component.focused]; - }; - $.tree_reference = function(id) { - return tree_component.inst[id] || null; - }; - - // rollback - $.tree_rollback = function(data) { - for(var i in data) { - if(typeof data[i] == "function") continue; - var tmp = tree_component.inst[i]; - var lock = !tmp.locked; - - // if not locked - lock the tree - if(lock) tmp.lock(true); - // Cancel ongoing rename - if(tmp.inp) tmp.inp.val("").blur(); - tmp.context.append = false; - tmp.container.html(data[i].html).find(".dragged").removeClass("dragged").end().find("div.context").remove(); - - if(data[i].selected) { - tmp.selected = $("#" + data[i].selected); - tmp.selected_arr = []; - tmp.container - .find("a.clicked").each( function () { - tmp.selected_arr.push(tmp.get_node(this)); - }); - } - // if this function set the lock - unlock - if(lock) tmp.lock(false); - - delete lock; - delete tmp; - } - }; - - // core - function tree_component () { - // instance manager - if(typeof tree_component.inst == "undefined") { - tree_component.cntr = 0; - tree_component.inst = {}; - - // DRAG'N'DROP STUFF - tree_component.drag_drop = { - isdown : false, // Is there a drag - drag_node : false, // The actual node - drag_help : false, // The helper - - init_x : false, - init_y : false, - moving : false, - - origin_tree : false, - marker : false, - - move_type : false, // before, after or inside - ref_node : false, // reference node - appended : false, // is helper appended - - foreign : false, // Is the dragged node a foreign one - droppable : [], // Array of classes that can be dropped onto the tree - - open_time : false, // Timeout for opening nodes - scroll_time : false // Timeout for scrolling - }; - // listening for clicks on foreign nodes - tree_component.mousedown = function(event) { - var tmp = $(event.target); - if(tree_component.drag_drop.droppable.length && tmp.is("." + tree_component.drag_drop.droppable.join(", .")) ) { - tree_component.drag_drop.drag_help = $(""); - tree_component.drag_drop.drag_node = tree_component.drag_drop.drag_help.find("li:eq(0)"); - tree_component.drag_drop.isdown = true; - tree_component.drag_drop.foreign = tmp; - tmp.blur(); - event.preventDefault(); - event.stopPropagation(); - return false; - } - event.stopPropagation(); - return true; - }; - tree_component.mouseup = function(event) { - var tmp = tree_component.drag_drop; - if(tmp.open_time) clearTimeout(tmp.open_time); - if(tmp.scroll_time) clearTimeout(tmp.scroll_time); - if(tmp.foreign === false && tmp.drag_node && tmp.drag_node.size()) { - tmp.drag_help.remove(); - if(tmp.move_type) { - var tree1 = tree_component.inst[tmp.ref_node.parents(".tree:eq(0)").attr("id")]; - if(tree1) tree1.moved(tmp.origin_tree.container.find("li.dragged"), tmp.ref_node, tmp.move_type, false, (tmp.origin_tree.settings.rules.drag_copy == "on" || (tmp.origin_tree.settings.rules.drag_copy == "ctrl" && event.ctrlKey) ) ); - } - tmp.move_type = false; - tmp.ref_node = false; - } - if(tmp.drag_node && tmp.foreign !== false) { - tmp.drag_help.remove(); - if(tmp.move_type) { - var tree1 = tree_component.inst[tmp.ref_node.parents(".tree:eq(0)").attr("id")]; - if(tree1) tree1.settings.callback.ondrop.call(null, tmp.foreign.get(0), tree1.get_node(tmp.ref_node).get(0), tmp.move_type, tree1); - } - tmp.foreign = false; - tmp.move_type = false; - tmp.ref_node = false; - } - // RESET EVERYTHING - tree_component.drag_drop.marker.hide(); - tmp.drag_help = false; - tmp.drag_node = false; - tmp.isdown = false; - tmp.init_x = false; - tmp.init_y = false; - tmp.moving = false; - tmp.appended = false; - $("li.dragged").removeClass("dragged"); - tmp.origin_tree = false; - event.preventDefault(); - event.stopPropagation(); - return false; - }; - tree_component.mousemove = function(event) { - var tmp = tree_component.drag_drop; - - if(tmp.isdown) { - if(!tmp.moving && Math.abs(tmp.init_x - event.pageX) < 5 && Math.abs(tmp.init_y - event.pageY) < 5) { - event.preventDefault(); - event.stopPropagation(); - return false; - } - else tree_component.drag_drop.moving = true; - - if(tmp.open_time) clearTimeout(tmp.open_time); - if(!tmp.appended) { - if(tmp.foreign !== false) tmp.origin_tree = $.tree_focused(); - $("body").append(tmp.drag_help); - tmp.w = tmp.drag_help.width(); - tmp.appended = true; - } - tmp.drag_help.css({ "left" : (event.pageX - (tmp.origin_tree.settings.ui.rtl ? tmp.w : -5 ) ), "top" : (event.pageY + 15) }); - - if(event.target.tagName == "IMG" && event.target.id == "marker") return false; - - var et = $(event.target); - var cnt = et.is(".tree") ? et : et.parents(".tree:eq(0)"); - - // if not moving over a tree - if(cnt.size() == 0 || !tree_component.inst[cnt.attr("id")]) { - if(tmp.scroll_time) clearTimeout(tmp.scroll_time); - if(tmp.drag_help.find("IMG").size() == 0) { - tmp.drag_help.find("li:eq(0)").append(""); - } - tmp.move_type = false; - tmp.ref_node = false; - tree_component.drag_drop.marker.hide(); - return false; - } - - var tree2 = tree_component.inst[cnt.attr("id")]; - tree2.off_height(); - - // if moving over another tree and multitree is false - if( tmp.foreign === false && tmp.origin_tree.container.get(0) != tree2.container.get(0) && (!tmp.origin_tree.settings.rules.multitree || !tree2.settings.rules.multitree) ) { - if(tmp.drag_help.find("IMG").size() == 0) { - tmp.drag_help.find("li:eq(0)").append(""); - } - tmp.move_type = false; - tmp.ref_node = false; - tree_component.drag_drop.marker.hide(); - return false; - } - - if(tmp.scroll_time) clearTimeout(tmp.scroll_time); - tmp.scroll_time = setTimeout( function() { tree2.scrollCheck(event.pageX,event.pageY); }, 50); - - var mov = false; - var st = cnt.scrollTop(); - - if(event.target.tagName == "A" ) { - // just in case if hover is over the draggable - if(et.is("#jstree-dragged")) return false; - if(tree2.get_node(event.target).hasClass("closed")) { - tmp.open_time = setTimeout( function () { tree2.open_branch(et); }, 500); - } - - var et_off = et.offset(); - var goTo = { - x : (et_off.left - 1), - y : (event.pageY - et_off.top) - }; - - if(cnt.children("ul:eq(0)").hasClass("rtl")) goTo.x += et.width() - 8; - var arr = []; - - if(goTo.y < tree2.li_height/3 + 1 ) arr = ["before","inside","after"]; - else if(goTo.y > tree2.li_height*2/3 - 1 ) arr = ["after","inside","before"]; - else { - if(goTo.y < tree2.li_height/2) arr = ["inside","before","after"]; - else arr = ["inside","after","before"]; - } - var ok = false; - $.each(arr, function(i, val) { - if(tree2.checkMove(tmp.origin_tree.container.find("li.dragged"), et, val)) { - mov = val; - ok = true; - return false; - } - }); - if(ok) { - switch(mov) { - case "before": - goTo.y = et_off.top - 2; - if(cnt.children("ul:eq(0)").hasClass("rtl")) { tree_component.drag_drop.marker.attr("src", tree2.settings.ui.theme_path + "marker_rtl.gif").width(40); } - else { tree_component.drag_drop.marker.attr("src", tree2.settings.ui.theme_path + "marker.gif").width(40); } - break; - case "after": - goTo.y = et_off.top - 2 + tree2.li_height; - if(cnt.children("ul:eq(0)").hasClass("rtl")) { tree_component.drag_drop.marker.attr("src", tree2.settings.ui.theme_path + "marker_rtl.gif").width(40); } - else { tree_component.drag_drop.marker.attr("src", tree2.settings.ui.theme_path + "marker.gif").width(40); } - break; - case "inside": - goTo.x -= 2; - if(cnt.children("ul:eq(0)").hasClass("rtl")) { - goTo.x += 36; - } - goTo.y = et_off.top - 2 + tree2.li_height/2; - tree_component.drag_drop.marker.attr("src", tree2.settings.ui.theme_path + "plus.gif").width(11); - break; - } - tmp.move_type = mov; - tmp.ref_node = $(event.target); - tmp.drag_help.find("IMG").remove(); - tree_component.drag_drop.marker.css({ "left" : goTo.x , "top" : goTo.y }).show(); - } - } - - if( (et.is(".tree") || et.is("ul") ) && et.find("li:eq(0)").size() == 0) { - var et_off = et.offset(); - tmp.move_type = "inside"; - tmp.ref_node = cnt.children("ul:eq(0)"); - tmp.drag_help.find("IMG").remove(); - tree_component.drag_drop.marker.attr("src", tree2.settings.ui.theme_path + "plus.gif").width(11); - tree_component.drag_drop.marker.css({ "left" : et_off.left + ( cnt.children("ul:eq(0)").hasClass("rtl") ? (cnt.width() - 10) : 10 ) , "top" : et_off.top + 15 }).show(); - } - else if(event.target.tagName != "A" || !ok) { - if(tmp.drag_help.find("IMG").size() == 0) { - tmp.drag_help.find("li:eq(0)").append(""); - } - tmp.move_type = false; - tmp.ref_node = false; - tree_component.drag_drop.marker.hide(); - } - event.preventDefault(); - event.stopPropagation(); - return false; - } - return true; - }; - }; - return { - cntr : ++tree_component.cntr, - settings : { - data : { - type : "predefined", // ENUM [json, xml_flat, xml_nested, predefined] - method : "GET", // HOW TO REQUEST FILES - async : false, // BOOL - async loading onopen - async_data : function (NODE, TREE_OBJ) { return { id : $(NODE).attr("id") || 0 } }, // PARAMETERS PASSED TO SERVER - url : false, // FALSE or STRING - url to document to be used (async or not) - json : false, // FALSE or OBJECT if type is JSON and async is false - the tree dump as json - xml : false // FALSE or STRING if type is XML_FLAT or XML_NESTED and async is false - a string to generate the tree from - }, - selected : false, // FALSE or STRING or ARRAY - opened : [], // ARRAY OF INITIALLY OPENED NODES - languages : [], // ARRAY of string values (which will be used as CSS classes - so they must be valid) - path : false, // FALSE or STRING (if false - will be autodetected) - cookies : false, // FALSE or OBJECT (prefix, open, selected, opts - from jqCookie - expires, path, domain, secure) - ui : { - dots : true, // BOOL - dots or no dots - rtl : false, // BOOL - is the tree right-to-left - animation : 0, // INT - duration of open/close animations in miliseconds - hover_mode : true, // SHOULD get_* functions chage focus or change hovered item - scroll_spd : 4, - theme_path : false, // Path to themes - theme_name : "default",// Name of theme - context : [ - { - id : "create", - label : "Create", - icon : "create.png", - visible : function (NODE, TREE_OBJ) { if(NODE.length != 1) return false; return TREE_OBJ.check("creatable", NODE); }, - action : function (NODE, TREE_OBJ) { TREE_OBJ.create(false, TREE_OBJ.get_node(NODE[0])); } - }, - "separator", - { - id : "rename", - label : "Rename", - icon : "rename.png", - visible : function (NODE, TREE_OBJ) { if(NODE.length != 1) return false; return TREE_OBJ.check("renameable", NODE); }, - action : function (NODE, TREE_OBJ) { TREE_OBJ.rename(NODE); } - }, - { - id : "delete", - label : "Delete", - icon : "remove.png", - visible : function (NODE, TREE_OBJ) { var ok = true; $.each(NODE, function () { if(TREE_OBJ.check("deletable", this) == false) ok = false; return false; }); return ok; }, - action : function (NODE, TREE_OBJ) { $.each(NODE, function () { TREE_OBJ.remove(this); }); } - } - ] - }, - rules : { - multiple : false, // FALSE | CTRL | ON - multiple selection off/ with or without holding Ctrl - metadata : false, // FALSE or STRING - attribute name (use metadata plugin) - type_attr : "rel", // STRING attribute name (where is the type stored if no metadata) - multitree : false, // BOOL - is drag n drop between trees allowed - createat : "bottom", // STRING (top or bottom) new nodes get inserted at top or bottom - use_inline : false, // CHECK FOR INLINE RULES - REQUIRES METADATA - clickable : "all", // which node types can the user select | default - all - renameable : "all", // which node types can the user select | default - all - deletable : "all", // which node types can the user delete | default - all - creatable : "all", // which node types can the user create in | default - all - draggable : "none", // which node types can the user move | default - none | "all" - dragrules : "all", // what move operations between nodes are allowed | default - none | "all" - drag_copy : false, // FALSE | CTRL | ON - drag to copy off/ with or without holding Ctrl - droppable : [], - drag_button : "left" // left, right or both - }, - lang : { - new_node : "New folder", - loading : "Loading ..." - }, - callback : { // various callbacks to attach custom logic to - // before focus - should return true | false - beforechange: function(NODE,TREE_OBJ) { return true }, - beforeopen : function(NODE,TREE_OBJ) { return true }, - beforeclose : function(NODE,TREE_OBJ) { return true }, - // before move - should return true | false - beforemove : function(NODE,REF_NODE,TYPE,TREE_OBJ) { return true }, - // before create - should return true | false - beforecreate: function(NODE,REF_NODE,TYPE,TREE_OBJ) { return true }, - // before rename - should return true | false - beforerename: function(NODE,LANG,TREE_OBJ) { return true }, - // before delete - should return true | false - beforedelete: function(NODE,TREE_OBJ) { return true }, - - onJSONdata : function(DATA,TREE_OBJ) { return DATA; }, - onselect : function(NODE,TREE_OBJ) { }, // node selected - ondeselect : function(NODE,TREE_OBJ) { }, // node deselected - onchange : function(NODE,TREE_OBJ) { }, // focus changed - onrename : function(NODE,LANG,TREE_OBJ,RB) { }, // node renamed ISNEW - TRUE|FALSE, current language - onmove : function(NODE,REF_NODE,TYPE,TREE_OBJ,RB) { }, // move completed (TYPE is BELOW|ABOVE|INSIDE) - oncopy : function(NODE,REF_NODE,TYPE,TREE_OBJ,RB) { }, // copy completed (TYPE is BELOW|ABOVE|INSIDE) - oncreate : function(NODE,REF_NODE,TYPE,TREE_OBJ,RB) { }, // node created, parent node (TYPE is createat) - ondelete : function(NODE,TREE_OBJ,RB) { }, // node deleted - onopen : function(NODE,TREE_OBJ) { }, // node opened - onopen_all : function(TREE_OBJ) { }, // all nodes opened - onclose : function(NODE,TREE_OBJ) { }, // node closed - error : function(TEXT,TREE_OBJ) { }, // error occured - // double click on node - defaults to open/close & select - ondblclk : function(NODE,TREE_OBJ) { TREE_OBJ.toggle_branch.call(TREE_OBJ, NODE); TREE_OBJ.select_branch.call(TREE_OBJ, NODE); }, - // right click - to prevent use: EV.preventDefault(); EV.stopPropagation(); return false - onrgtclk : function(NODE,TREE_OBJ,EV) { }, - onload : function(TREE_OBJ) { }, - onfocus : function(TREE_OBJ) { }, - ondrop : function(NODE,REF_NODE,TYPE,TREE_OBJ) {} - } - }, - // INITIALIZATION - init : function(elem, conf) { - var _this = this; - this.container = $(elem); - if(this.container.size == 0) { alert("Invalid container node!"); return } - - tree_component.inst[this.cntr] = this; - if(!this.container.attr("id")) this.container.attr("id","jstree_" + this.cntr); - tree_component.inst[this.container.attr("id")] = tree_component.inst[this.cntr]; - tree_component.focused = this.cntr; - - var opts = $.extend({},conf); - - // MERGE OPTIONS WITH DEFAULTS - if(opts && opts.cookies) { - this.settings.cookies = $.extend({},this.settings.cookies,opts.cookies); - delete opts.cookies; - if(!this.settings.cookies.opts) this.settings.cookies.opts = {}; - } - if(opts && opts.callback) { - this.settings.callback = $.extend({},this.settings.callback,opts.callback); - delete opts.callback; - } - if(opts && opts.data) { - this.settings.data = $.extend({},this.settings.data,opts.data); - delete opts.data; - } - if(opts && opts.ui) { - this.settings.ui = $.extend({},this.settings.ui,opts.ui); - delete opts.ui; - } - if(opts && opts.rules) { - this.settings.rules = $.extend({},this.settings.rules,opts.rules); - delete opts.rules; - } - if(opts && opts.lang) { - this.settings.lang = $.extend({},this.settings.lang,opts.lang); - delete opts.lang; - } - this.settings = $.extend({},this.settings,opts); - - // PATH TO IMAGES AND XSL - if(this.settings.path == false) { - this.path = ""; - $("script").each( function () { - if(this.src.toString().match(/tree_component.*?js$/)) { - _this.path = this.src.toString().replace(/tree_component.*?js$/, ""); - } - }); - } - else this.path = this.settings.path; - - // DEAL WITH LANGUAGE VERSIONS - this.current_lang = this.settings.languages && this.settings.languages.length ? this.settings.languages[0] : false; - if(this.settings.languages && this.settings.languages.length) { - this.sn = get_sheet_num("tree_component.css"); - if(this.sn === false && document.styleSheets.length) this.sn = document.styleSheets.length; - var st = false; - var id = this.container.attr("id") ? "#" + this.container.attr("id") : ".tree"; - for(var ln = 0; ln < this.settings.languages.length; ln++) { - st = add_css(id + " ." + this.settings.languages[ln], this.sn); - if(st !== false) { - if(this.settings.languages[ln] == this.current_lang) st.style.display = ""; - else st.style.display = "none"; - } - } - } - - // DROPPABLES - if(this.settings.rules.droppable.length) { - for(var i in this.settings.rules.droppable) { - if(typeof this.settings.rules.droppable[i] == "function") continue; - tree_component.drag_drop.droppable.push(this.settings.rules.droppable[i]); - } - tree_component.drag_drop.droppable = $.unique(tree_component.drag_drop.droppable); - } - - // THEMES - if(this.settings.ui.theme_path === false) this.settings.ui.theme_path = this.path + "themes/"; - this.theme = this.settings.ui.theme_path; - if(_this.settings.ui.theme_name) { - this.theme += _this.settings.ui.theme_name + "/"; - if(_this.settings.ui.theme_name != "themeroller" && !tree_component.def_style) { add_sheet(_this.settings.ui.theme_path + "default/style.css"); tree_component.def_style = true; } - add_sheet(_this.theme + "style.css"); - } - - this.container.addClass("tree"); - if(_this.settings.ui.theme_name != "themeroller") this.container.addClass("tree-default"); - if(this.settings.ui.theme_name && this.settings.ui.theme_name != "default") this.container.addClass("tree-" + _this.settings.ui.theme_name); - if(this.settings.ui.theme_name == "themeroller") this.container.addClass("ui-widget ui-widget-content"); - if(this.settings.rules.multiple) this.selected_arr = []; - this.offset = false; - - // CONTEXT MENU - this.context_menu(); - - this.hovered = false; - this.locked = false; - - // CREATE DUMMY FOR MOVING - if(this.settings.rules.draggable != "none" && tree_component.drag_drop.marker === false) { - var _this = this; - tree_component.drag_drop.marker = $("") - .attr({ - id : "marker", - src : _this.settings.ui.theme_path + "marker.gif" - }) - .css({ - height : "5px", - width : "40px", - display : "block", - position : "absolute", - left : "30px", - top : "30px", - zIndex : "1000" - }).hide().appendTo("body"); - } - this.refresh(); - this.attachEvents(); - this.focus(); - }, - off_height : function () { - if(this.offset === false) { - this.container.css({ position : "relative" }); - this.offset = this.container.offset(); - var tmp = 0; - tmp = parseInt($.curCSS(this.container.get(0), "paddingTop", true),10); - if(tmp) this.offset.top += tmp; - tmp = parseInt($.curCSS(this.container.get(0), "borderTopWidth", true),10); - if(tmp) this.offset.top += tmp; - this.container.css({ position : "" }); - } - if(!this.li_height) { - var tmp = this.container.find("ul li.closed, ul li.leaf").eq(0); - this.li_height = tmp.height(); - if(tmp.children("ul:eq(0)").size()) this.li_height -= tmp.children("ul:eq(0)").height(); - if(!this.li_height) this.li_height = 18; - } - }, - context_menu : function () { - this.context = false; - if(this.settings.ui.context != false) { - var str = '
'; - for(var i in this.settings.ui.context) { - if(typeof this.settings.ui.context[i] == "function") continue; - if(this.settings.ui.context[i] == "separator") { - str += " "; - continue; - } - var icn = ""; - if(this.settings.ui.context[i].icon) icn = 'background-image:url(\'' + ( this.settings.ui.context[i].icon.indexOf("/") == -1 ? this.theme + this.settings.ui.context[i].icon : this.settings.ui.context[i].icon ) + '\');'; - str += '' + this.settings.ui.context[i].label + ''; - } - str += '
'; - this.context = $(str); - this.context.hide(); - this.context.append = false; - } - }, - // REPAINT TREE - refresh : function (obj) { - if(this.locked) return this.error("LOCKED"); - var _this = this; - - this.is_partial_refresh = obj ? true : false; - - // SAVE OPENED - this.opened = Array(); - if(this.settings.cookies && $.cookie(this.settings.cookies.prefix + '_open')) { - var str = $.cookie(this.settings.cookies.prefix + '_open'); - var tmp = str.split(","); - $.each(tmp, function () { - if(this.replace(/^#/,"").length > 0) { _this.opened.push("#" + this.replace(/^#/,"")); } - }); - this.settings.opened = false; - } - else if(this.settings.opened != false) { - $.each(this.settings.opened, function (i, item) { - if(this.replace(/^#/,"").length > 0) { _this.opened.push("#" + this.replace(/^#/,"")); } - }); - this.settings.opened = false; - } - else { - this.container.find("li.open").each(function (i) { if(this.id) { _this.opened.push("#" + this.id); } }); - } - - // SAVE SELECTED - if(this.selected) { - this.settings.selected = Array(); - if(obj) { - $(obj).find("li:has(a.clicked)").each(function () { - $this = $(this); - if($this.attr("id")) _this.settings.selected.push("#" + $this.attr("id")); - }); - } - else { - if(this.selected_arr) { - $.each(this.selected_arr, function () { - if(this.attr("id")) _this.settings.selected.push("#" + this.attr("id")); - }); - } - else { - if(this.selected.attr("id")) this.settings.selected.push("#" + this.selected.attr("id")); - } - } - } - else if(this.settings.cookies && $.cookie(this.settings.cookies.prefix + '_selected')) { - this.settings.selected = Array(); - var str = $.cookie(this.settings.cookies.prefix + '_selected'); - var tmp = str.split(","); - $.each(tmp, function () { - if(this.replace(/^#/,"").length > 0) { _this.settings.selected.push("#" + this.replace(/^#/,"")); } - }); - } - else if(this.settings.selected !== false) { - var tmp = Array(); - if((typeof this.settings.selected).toLowerCase() == "object") { - $.each(this.settings.selected, function () { - if(this.replace(/^#/,"").length > 0) tmp.push("#" + this.replace(/^#/,"")); - }); - } - else { - if(this.settings.selected.replace(/^#/,"").length > 0) tmp.push("#" + this.settings.selected.replace(/^#/,"")); - } - this.settings.selected = tmp; - } - - if(obj && this.settings.data.async) { - this.opened = Array(); - obj = this.get_node(obj); - obj.find("li.open").each(function (i) { _this.opened.push("#" + this.id); }); - if(obj.hasClass("open")) obj.removeClass("open").addClass("closed"); - if(obj.hasClass("leaf")) obj.removeClass("leaf"); - obj.children("ul:eq(0)").html(""); - return this.open_branch(obj, true, function () { _this.reselect.apply(_this); }); - } - - if(this.settings.data.type == "xml_flat" || this.settings.data.type == "xml_nested") { - this.scrtop = this.container.get(0).scrollTop; - var xsl = (this.settings.data.type == "xml_flat") ? "flat.xsl" : "nested.xsl"; - if(this.settings.data.xml) this.container.getTransform(this.path + xsl, this.settings.data.xml, { params : { theme_name : _this.settings.ui.theme_name, theme_path : _this.theme }, meth : _this.settings.data.method, dat : _this.settings.data.async_data.apply(_this,[obj, _this]), callback: function () { _this.context_menu.apply(_this); _this.reselect.apply(_this); } }); - else this.container.getTransform(this.path + xsl, this.settings.data.url, { params : { theme_name : _this.settings.ui.theme_name, theme_path : _this.theme }, meth : _this.settings.data.method, dat : _this.settings.data.async_data.apply(_this,[obj, _this]), callback: function () { _this.context_menu.apply(_this); _this.reselect.apply(_this); } }); - return; - } - else if(this.settings.data.type == "json") { - if(this.settings.data.json) { - var str = ""; - if(this.settings.data.json.length) { - for(var i = 0; i < this.settings.data.json.length; i++) { - str += this.parseJSON(this.settings.data.json[i]); - } - } else str = this.parseJSON(this.settings.data.json); - this.container.html("
    " + str + "
"); - this.container.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed"); - this.container.find("li").not(".open").not(".closed").addClass("leaf"); - this.context_menu(); - this.reselect(); - } - else { - var _this = this; - $.ajax({ - type : this.settings.data.method, - url : this.settings.data.url, - data : this.settings.data.async_data(false, this), - dataType : "json", - success : function (data) { - data = _this.settings.callback.onJSONdata.call(null, data, _this); - var str = ""; - if(data.length) { - for(var i = 0; i < data.length; i++) { - str += _this.parseJSON(data[i]); - } - } else str = _this.parseJSON(data); - _this.container.html("
    " + str + "
"); - _this.container.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed"); - _this.container.find("li").not(".open").not(".closed").addClass("leaf"); - _this.context_menu.apply(_this); - _this.reselect.apply(_this); - }, - error : function (xhttp, textStatus, errorThrown) { _this.error(errorThrown + " " + textStatus); } - }); - } - } - else { - this.container.children("ul:eq(0)"); - this.container.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed"); - this.container.find("li").not(".open").not(".closed").addClass("leaf"); - this.reselect(); - } - }, - // CONVERT JSON TO HTML - parseJSON : function (data) { - if(!data || !data.data) return ""; - var str = ""; - str += "
  •  "; - } - str += ( (typeof data.data[this.settings.languages[i]].title).toLowerCase() != "undefined" ? data.data[this.settings.languages[i]].title : data.data[this.settings.languages[i]] ) + ""; - } - } - else { - var attr = {}; - attr["href"] = "#"; - attr["style"] = ""; - attr["class"] = ""; - if((typeof data.data.attributes).toLowerCase() != "undefined") { - for(var i in data.data.attributes) { - if(typeof data.data.attributes[i] == "function") continue; - if(i == "style" || i == "class") attr[i] += " " + data.data.attributes[i]; - else attr[i] = data.data.attributes[i]; - } - } - if(data.data.icon && this.settings.ui.theme_name != "themeroller") { - var icn = data.data.icon.indexOf("/") == -1 ? this.theme + data.data.icon : data.data.icon; - attr["style"] += " ; background-image:url('" + icn + "');"; - } - str += " "; - } - str += ( (typeof data.data.title).toLowerCase() != "undefined" ? data.data.title : data.data ) + ""; - } - if(data.children && data.children.length) { - str += '
      '; - for(var i = 0; i < data.children.length; i++) { - str += this.parseJSON(data.children[i]); - } - str += '
    '; - } - str += "
    • "; - return str; - }, - // getJSON from HTML - getJSON : function (nod, outer_attrib, inner_attrib, force) { - var _this = this; - if(!nod || $(nod).size() == 0) { - nod = this.container.children("ul").children("li"); - } - else nod = $(nod); - - if(nod.size() > 1) { - var arr = []; - nod.each(function () { - arr.push(_this.getJSON(this, outer_attrib, inner_attrib, force)); - }); - return arr; - } - - if(!outer_attrib) outer_attrib = [ "id", "rel", "class" ]; - if(!inner_attrib) inner_attrib = [ ]; - var obj = { attributes : {}, data : false }; - for(var i in outer_attrib) { - if(typeof outer_attrib[i] == "function") continue; - var val = (outer_attrib[i] == "class") ? nod.attr(outer_attrib[i]).replace("last","").replace("leaf","").replace("closed","").replace("open","") : nod.attr(outer_attrib[i]); - if(typeof val != "undefined" && val.replace(" ","").length > 0) obj.attributes[outer_attrib[i]] = val; - delete val; - } - if(this.settings.languages.length) { - obj.data = {}; - for(var i in this.settings.languages) { - if(typeof this.settings.languages[i] == "function") continue; - var a = nod.children("a." + this.settings.languages[i]); - if(force || inner_attrib.length || a.get(0).style.backgroundImage.toString().length) { - obj.data[this.settings.languages[i]] = {}; - obj.data[this.settings.languages[i]].title = a.text(); - if(a.get(0).style.backgroundImage.length) { - obj.data[this.settings.languages[i]].icon = a.get(0).style.backgroundImage.replace("url(","").replace(")",""); - } - if(this.settings.ui.theme_name == "themeroller" && a.children("ins").size()) { - var tmp = a.children("ins").attr("class"); - var cls = false; - $.each(tmp.split(" "), function (i, val) { - if(val.indexOf("ui-icon-") == 0) { - cls = val; - return false; - } - }); - if(cls) obj.data[this.settings.languages[i]].icon = cls; - } - if(inner_attrib.length) { - obj.data[this.settings.languages[i]].attributes = {}; - for(var j in inner_attrib) { - if(typeof inner_attrib[j] == "function") continue; - var val = a.attr(inner_attrib[j]); - if(typeof val != "undefined" && val.replace(" ","").length > 0) obj.data[this.settings.languages[i]].attributes[inner_attrib[j]] = val; - delete val; - } - } - } - else { - obj.data[this.settings.languages[i]] = a.text(); - } - } - } - else { - var a = nod.children("a"); - if(force || inner_attrib.length || a.get(0).style.backgroundImage.toString().length) { - obj.data = {}; - obj.data.title = a.text(); - if(a.get(0).style.backgroundImage.length) { - obj.data.icon = a.get(0).style.backgroundImage.replace("url(","").replace(")",""); - } - if(this.settings.ui.theme_name == "themeroller" && a.children("ins").size()) { - var tmp = a.children("ins").attr("class"); - var cls = false; - $.each(tmp.split(" "), function (i, val) { - if(val.indexOf("ui-icon-") == 0) { - cls = val; - return false; - } - }); - if(cls) obj.data[this.settings.languages[i]].icon = cls; - } - if(inner_attrib.length) { - obj.data.attributes = {}; - for(var j in inner_attrib) { - if(typeof inner_attrib[j] == "function") continue; - var val = a.attr(inner_attrib[j]); - if(typeof val != "undefined" && val.replace(" ","").length > 0) obj.data.attributes[inner_attrib[j]] = val; - delete val; - } - } - } - else { - obj.data = a.text(); - } - } - - if(nod.children("ul").size() > 0) { - obj.children = []; - nod.children("ul").children("li").each(function () { - obj.children.push(_this.getJSON(this, outer_attrib, inner_attrib, force)); - }); - } - return obj; - }, - // getXML from HTML - getXML : function (tp, nod, outer_attrib, inner_attrib, cb) { - var _this = this; - if(tp != "flat") tp = "nested"; - if(!nod || $(nod).size() == 0) { - nod = this.container.children("ul").children("li"); - } - else nod = $(nod); - - if(nod.size() > 1) { - var obj = ''; - nod.each(function () { - obj += _this.getXML(tp, this, outer_attrib, inner_attrib, true); - }); - obj += ''; - return obj; - } - - if(!outer_attrib) outer_attrib = [ "id", "rel", "class" ]; - if(!inner_attrib) inner_attrib = [ ]; - var obj = ''; - - if(!cb) obj = ''; - - obj += ' 0) obj += ' ' + outer_attrib[i] + '="' + val + '" '; - delete val; - } - obj += '>'; - - obj += ''; - if(this.settings.languages.length) { - for(var i in this.settings.languages) { - if(typeof this.settings.languages[i] == "function") continue; - var a = nod.children("a." + this.settings.languages[i]); - obj += ' 0) obj += ' ' + inner_attrib[j] + '="' + val + '" '; - delete val; - } - } - } - obj += '>'; - } - } - else { - var a = nod.children("a"); - obj += ' 0) obj += ' ' + inner_attrib[j] + '="' + val + '" '; - delete val; - } - } - } - obj += '>'; - } - obj += ''; - - if(tp == "flat") obj += ''; - - if(nod.children("ul").size() > 0) { - nod.children("ul").children("li").each(function () { - obj += _this.getXML(tp, this, outer_attrib, inner_attrib, true); - }); - } - - if(tp == "nested") obj += ''; - - if(!cb) obj += ''; - return obj; - }, - focus : function () { - if(this.locked) return false; - if(tree_component.focused != this.cntr) { - tree_component.focused = this.cntr; - this.settings.callback.onfocus.call(null, this); - } - }, - show_context : function (obj) { - this.context.show(); - var tmp = $(obj).children("a:visible").offset(); - this.context.css({ "left" : (tmp.left), "top" : (tmp.top + parseInt(obj.children("a:visible").height()) + 2) }); - }, - hide_context : function () { - if(this.context.to_remove && this.context.apply_to) this.context.apply_to.children("a").removeClass("clicked"); - this.context.apply_to = false; - this.context.hide(); - }, - // ALL EVENTS - attachEvents : function () { - var _this = this; - - this.container - .bind("mousedown.jstree", function (event) { - if(tree_component.drag_drop.isdown) { - tree_component.drag_drop.move_type = false; - event.preventDefault(); - event.stopPropagation(); - event.stopImmediatePropagation(); - return false; - } - }) - .bind("mouseup.jstree", function (event) { - setTimeout( function() { _this.focus.apply(_this); }, 5); - }) - .bind("click.jstree", function (event) { - //event.stopPropagation(); - return true; - }); - $("#" + this.container.attr("id") + " li") - .live("click", function(event) { // WHEN CLICK IS ON THE ARROW - if(event.target.tagName != "LI") return true; - _this.off_height(); - if(event.pageY - $(event.target).offset().top > _this.li_height) return true; - _this.toggle_branch.apply(_this, [event.target]); - event.stopPropagation(); - return false; - }); - $("#" + this.container.attr("id") + " li a") - .live("click.jstree", function (event) { // WHEN CLICK IS ON THE TEXT OR ICON - if(event.which && event.which == 3) return true; - if(_this.locked) { - event.preventDefault(); - event.target.blur(); - return _this.error("LOCKED"); - } - _this.select_branch.apply(_this, [event.target, event.ctrlKey || _this.settings.rules.multiple == "on"]); - if(_this.inp) { _this.inp.blur(); } - event.preventDefault(); - event.target.blur(); - return false; - }) - .live("dblclick.jstree", function (event) { // WHEN DOUBLECLICK ON TEXT OR ICON - if(_this.locked) { - event.preventDefault(); - event.stopPropagation(); - event.target.blur(); - return _this.error("LOCKED"); - } - _this.settings.callback.ondblclk.call(null, _this.get_node(event.target).get(0), _this); - event.preventDefault(); - event.stopPropagation(); - event.target.blur(); - }) - .live("contextmenu.jstree", function (event) { - if(_this.locked) { - event.target.blur(); - return _this.error("LOCKED"); - } - var val = _this.settings.callback.onrgtclk.call(null, _this.get_node(event.target).get(0), _this, event); - if(_this.context) { - if(_this.context.append == false) { - $("body").append(_this.context); - _this.context.append = true; - for(var i in _this.settings.ui.context) { - if(typeof _this.settings.ui.context[i] == "function") continue; - if(_this.settings.ui.context[i] == "separator") continue; - (function () { - var func = _this.settings.ui.context[i].action; - _this.context.children("[rel=" + _this.settings.ui.context[i].id +"]") - .bind("click", function (event) { - if(!$(this).hasClass("disabled")) { - func.call(null, _this.context.apply_to || null, _this); - _this.hide_context(); - } - event.stopPropagation(); - event.preventDefault(); - return false; - }) - .bind("mouseup", function (event) { - this.blur(); - if($(this).hasClass("disabled")) { - event.stopPropagation(); - event.preventDefault(); - return false; - } - }) - .bind("mousedown", function (event) { - event.stopPropagation(); - event.preventDefault(); - }); - })(); - } - } - var obj = _this.get_node(event.target); - if(_this.inp) { _this.inp.blur(); } - if(obj) { - if(!obj.children("a:eq(0)").hasClass("clicked")) { - // _this.select_branch.apply(_this, [event.target, event.ctrlKey || _this.settings.rules.multiple == "on"]); - _this.context.apply_to = obj; - _this.context.to_remove = true; - _this.context.apply_to.children("a").addClass("clicked"); - event.target.blur(); - } - else { - _this.context.to_remove = false; - _this.context.apply_to = (_this.selected_arr && _this.selected_arr.length > 1) ? _this.selected_arr : _this.selected; - } - - _this.context.children("a").removeClass("disabled").show(); - var go = false; - for(var i in _this.settings.ui.context) { - if(typeof _this.settings.ui.context[i] == "function") continue; - if(_this.settings.ui.context[i] == "separator") continue; - var state = _this.settings.ui.context[i].visible.call(null, _this.context.apply_to, _this); - if(state === false) _this.context.children("[rel=" + _this.settings.ui.context[i].id +"]").addClass("disabled"); - if(state === -1) _this.context.children("[rel=" + _this.settings.ui.context[i].id +"]").hide(); - else go = true; - } - if(go == true) _this.show_context(obj); - event.preventDefault(); - event.stopPropagation(); - return false; - } - } - return val; - }) - .live("mouseover.jstree", function (event) { - if(_this.locked) { - event.preventDefault(); - event.stopPropagation(); - return _this.error("LOCKED"); - } - if( (_this.settings.ui.hover_mode || _this.settings.ui.theme_name == "themeroller" ) && _this.hovered !== false && event.target.tagName == "A") { - _this.hovered.children("a").removeClass("hover ui-state-hover"); - _this.hovered = false; - } - if(_this.settings.ui.theme_name == "themeroller") { - _this.hover_branch.apply(_this, [event.target]); - } - }); - if(_this.settings.ui.theme_name == "themeroller") { - $("#" + this.container.attr("id") + " li a").live("mouseout", function (event) { - if(_this.hovered) _this.hovered.children("a").removeClass("hover ui-state-hover"); - }); - } - - // ATTACH DRAG & DROP ONLY IF NEEDED - if(this.settings.rules.draggable != "none") { - $("#" + this.container.attr("id") + " li a") - .live("mousedown.jstree", function (event) { - if(_this.settings.rules.drag_button == "left" && event.which && event.which != 1) return true; - if(_this.settings.rules.drag_button == "right" && event.which && event.which != 3) return true; - _this.focus.apply(_this); - if(_this.locked) return _this.error("LOCKED"); - // SELECT LIST ITEM NODE - var obj = _this.get_node(event.target); - // IF ITEM IS DRAGGABLE - if(_this.settings.rules.multiple != false && _this.selected_arr.length > 1 && obj.children("a:eq(0)").hasClass("clicked")) { - var counter = 0; - for(var i in _this.selected_arr) { - if(typeof _this.selected_arr[i] == "function") continue; - if(_this.check("draggable", _this.selected_arr[i])) { - _this.selected_arr[i].addClass("dragged"); - tree_component.drag_drop.origin_tree = _this; - counter ++; - } - } - if(counter > 0) { - if(_this.check("draggable", obj)) tree_component.drag_drop.drag_node = obj; - else tree_component.drag_drop.drag_node = _this.container.find("li.dragged:eq(0)"); - tree_component.drag_drop.isdown = true; - tree_component.drag_drop.drag_help = $("
    ").append("
      "); - var tmp = $(tree_component.drag_drop.drag_node.get(0).cloneNode(true)); - if(_this.settings.languages.length > 0) tmp.find("a").not("." + _this.current_lang).hide(); - tree_component.drag_drop.drag_help.children("ul:eq(0)").append(tmp); - tree_component.drag_drop.drag_help.find("li:eq(0)").removeClass("last").addClass("last").children("a").html("Multiple selection").end().children("ul").remove(); - } - } - else { - if(_this.check("draggable", obj)) { - tree_component.drag_drop.drag_node = obj; - tree_component.drag_drop.drag_help = $("
      ").append("
        "); - var tmp = $(obj.get(0).cloneNode(true)); - if(_this.settings.languages.length > 0) tmp.find("a").not("." + _this.current_lang).hide(); - tree_component.drag_drop.drag_help.children("ul:eq(0)").append(tmp); - tree_component.drag_drop.drag_help.find("li:eq(0)").removeClass("last").addClass("last"); - tree_component.drag_drop.isdown = true; - tree_component.drag_drop.foreign = false; - tree_component.drag_drop.origin_tree = _this; - obj.addClass("dragged"); - } - } - tree_component.drag_drop.init_x = event.pageX; - tree_component.drag_drop.init_y = event.pageY; - obj.blur(); - event.preventDefault(); - event.stopPropagation(); - return false; - }); - $(document) - .bind("mousedown.jstree", tree_component.mousedown) - .bind("mouseup.jstree", tree_component.mouseup) - .bind("mousemove.jstree", tree_component.mousemove); - } - // ENDIF OF DRAG & DROP FUNCTIONS - if(_this.context) $(document).bind("mousedown", function() { _this.hide_context(); }); - }, - checkMove : function (NODES, REF_NODE, TYPE) { - if(this.locked) return this.error("LOCKED"); - var _this = this; - - // OVER SELF OR CHILDREN - if(REF_NODE.parents("li.dragged").size() > 0 || REF_NODE.is(".dragged")) return this.error("MOVE: NODE OVER SELF"); - // CHECK AGAINST DRAG_RULES - if(NODES.size() == 1) { - var NODE = NODES.eq(0); - if(tree_component.drag_drop.foreign) { - if(this.settings.rules.droppable.length == 0) return false; - if(!NODE.is("." + this.settings.rules.droppable.join(", ."))) return false; - var ok = false; - for(var i in this.settings.rules.droppable) { - if(typeof this.settings.rules.droppable[i] == "function") continue; - if(NODE.is("." + this.settings.rules.droppable[i])) { - if(this.settings.rules.metadata) { - $.metadata.setType("attr", this.settings.rules.metadata); - NODE.attr(this.settings.rules.metadata, "type: '" + this.settings.rules.droppable[i] + "'"); - } - else { - NODE.attr(this.settings.rules.type_attr, this.settings.rules.droppable[i]); - } - ok = true; - break; - } - } - if(!ok) return false; - } - if(!this.check("dragrules", [NODE, TYPE, REF_NODE.parents("li:eq(0)")])) return this.error("MOVE: AGAINST DRAG RULES"); - } - else { - var ok = true; - NODES.each(function (i) { - if(ok == false) return false; - //if(i > 0) { - // var ref = NODES.eq( (i - 1) ); - // var mv = "after"; - //} - //else { - var ref = REF_NODE; - var mv = TYPE; - //} - if(!_this.check.apply(_this,["dragrules", [$(this), mv, ref]])) ok = false; - }); - if(ok == false) return this.error("MOVE: AGAINST DRAG RULES"); - } - // CHECK AGAINST METADATA - if(this.settings.rules.use_inline && this.settings.rules.metadata) { - var nd = false; - if(TYPE == "inside") nd = REF_NODE.parents("li:eq(0)"); - else nd = REF_NODE.parents("li:eq(1)"); - if(nd.size()) { - // VALID CHILDREN CHECK - if(typeof nd.metadata()["valid_children"] != "undefined") { - var tmp = nd.metadata()["valid_children"]; - var ok = true; - NODES.each(function (i) { - if(ok == false) return false; - if($.inArray(_this.get_type(this), tmp) == -1) ok = false; - }); - if(ok == false) return this.error("MOVE: NOT A VALID CHILD"); - } - // CHECK IF PARENT HAS FREE SLOTS FOR CHILDREN - if(typeof nd.metadata()["max_children"] != "undefined") { - if((nd.children("ul:eq(0)").children("li").not(".dragged").size() + NODES.size()) > nd.metadata().max_children) return this.error("MOVE: MAX CHILDREN REACHED"); - } - // CHECK FOR MAXDEPTH UP THE CHAIN - var incr = 0; - NODES.each(function (j) { - var i = 1; - var t = $(this); - while(i < 100) { - t = t.children("ul").children("li"); - if(t.size() == 0) break; - i ++ - } - incr = Math.max(i,incr); - }); - var ok = true; - - if((typeof $(nd).metadata().max_depth).toLowerCase() != "undefined" && $(nd).metadata().max_depth < incr) ok = false; - else { - nd.parents("li").each(function(i) { - if(ok == false) return false; - if((typeof $(this).metadata().max_depth).toLowerCase() != "undefined") { - if( (i + incr) >= $(this).metadata().max_depth) ok = false; - } - }); - } - if(ok == false) return this.error("MOVE: MAX_DEPTH REACHED"); - } - } - return true; - }, - // USED AFTER REFRESH - reselect : function (is_callback) { - var _this = this; - - if(!is_callback) this.cl_count = 0; - else this.cl_count --; - // REOPEN BRANCHES - if(this.opened && this.opened.length) { - var opn = false; - for(var j = 0; this.opened && j < this.opened.length; j++) { - if(this.settings.data.async) { - if(this.get_node(this.opened[j]).size() > 0) { - opn = true; - var tmp = this.opened[j]; - delete this.opened[j]; - this.open_branch(tmp, true, function () { _this.reselect.apply(_this, [true]); } ); - this.cl_count ++; - } - } - else this.open_branch(this.opened[j], true); - } - if(this.settings.data.async && opn) return; - delete this.opened; - } - if(this.cl_count > 0) return; - - // DOTS and RIGHT TO LEFT - if(this.settings.ui.rtl) this.container.css("direction","rtl").children("ul:eq(0)").addClass("rtl"); - else this.container.css("direction","ltr").children("ul:eq(0)").addClass("ltr"); - if(this.settings.ui.dots == false) this.container.children("ul:eq(0)").addClass("no_dots"); - - // REPOSITION SCROLL - if(this.scrtop) { - this.container.scrollTop(_this.scrtop); - delete this.scrtop; - } - // RESELECT PREVIOUSLY SELECTED - if(this.settings.selected !== false) { - $.each(this.settings.selected, function (i) { - if(_this.is_partial_refresh) _this.select_branch($(_this.settings.selected[i], _this.container), (_this.settings.rules.multiple !== false) ); - else _this.select_branch($(_this.settings.selected[i], _this.container), (_this.settings.rules.multiple !== false && i > 0) ); - }); - this.settings.selected = false; - } - if(this.settings.ui.theme_name == "themeroller") this.container.find("a").addClass("ui-state-default"); - this.settings.callback.onload.call(null, _this); - }, - // GET THE EXTENDED LI ELEMENT - get_node : function (obj) { - var obj = $(obj); - return obj.is("li") ? obj : obj.parents("li:eq(0)"); - }, - // GET THE TYPE OF THE NODE - get_type : function (obj) { - obj = !obj ? this.selected : this.get_node(obj); - if(!obj) return; - if(this.settings.rules.metadata) { - $.metadata.setType("attr", this.settings.rules.metadata); - var tmp = obj.metadata().type; - if(tmp) return tmp; - } - return obj.attr(this.settings.rules.type_attr); - }, - // SCROLL CONTAINER WHILE DRAGGING - scrollCheck : function (x,y) { - var _this = this; - var cnt = _this.container; - var off = _this.container.offset(); - - var st = cnt.scrollTop(); - var sl = cnt.scrollLeft(); - // DETECT HORIZONTAL SCROLL - var h_cor = (cnt.get(0).scrollWidth > cnt.width()) ? 40 : 20; - - if(y - off.top < 20) cnt.scrollTop(Math.max( (st - _this.settings.ui.scroll_spd) ,0)); // NEAR TOP - if(cnt.height() - (y - off.top) < h_cor) cnt.scrollTop(st + _this.settings.ui.scroll_spd); // NEAR BOTTOM - if(x - off.left < 20) cnt.scrollLeft(Math.max( (sl - _this.settings.ui.scroll_spd),0)); // NEAR LEFT - if(cnt.width() - (x - off.left) < 40) cnt.scrollLeft(sl + _this.settings.ui.scroll_spd); // NEAR RIGHT - - if(cnt.scrollLeft() != sl || cnt.scrollTop() != st) { - _this.moveType = false; - _this.moveRef = false; - tree_component.drag_drop.marker.hide(); - } - tree_component.drag_drop.scroll_time = setTimeout( function() { _this.scrollCheck(x,y); }, 50); - }, - check : function (rule, nodes) { - if(this.locked) return this.error("LOCKED"); - // CHECK LOCAL RULES IF METADATA - if(rule != "dragrules" && this.settings.rules.use_inline && this.settings.rules.metadata) { - $.metadata.setType("attr", this.settings.rules.metadata); - if(typeof this.get_node(nodes).metadata()[rule] != "undefined") return this.get_node(nodes).metadata()[rule]; - } - if(!this.settings.rules[rule]) return false; - if(this.settings.rules[rule] == "none") return false; - if(this.settings.rules[rule] == "all") return true; - - if(rule == "dragrules") { - var nds = new Array(); - nds[0] = this.get_type(nodes[0]); - nds[1] = nodes[1]; - nds[2] = this.get_type(nodes[2]); - for(var i = 0; i < this.settings.rules.dragrules.length; i++) { - var r = this.settings.rules.dragrules[i]; - var n = (r.indexOf("!") === 0) ? false : true; - if(!n) r = r.replace("!",""); - var tmp = r.split(" "); - for(var j = 0; j < 3; j++) { - if(tmp[j] == nds[j] || tmp[j] == "*") tmp[j] = true; - } - if(tmp[0] === true && tmp[1] === true && tmp[2] === true) return n; - } - return false; - } - else - return ($.inArray(this.get_type(nodes),this.settings.rules[rule]) != -1) ? true : false; - }, - hover_branch : function (obj) { - if(this.locked) return this.error("LOCKED"); - if(this.settings.ui.hover_mode == false && this.settings.ui.theme_name != "themeroller") return this.select_branch(obj); - var _this = this; - var obj = _this.get_node(obj); - if(!obj.size()) return this.error("HOVER: NOT A VALID NODE"); - // CHECK AGAINST RULES FOR SELECTABLE NODES - if(!_this.check("clickable", obj)) return this.error("SELECT: NODE NOT SELECTABLE"); - if(this.hovered) this.hovered.children("A").removeClass("hover ui-state-hover"); - - // SAVE NEWLY SELECTED - this.hovered = obj; - - // FOCUS NEW NODE AND OPEN ALL PARENT NODES IF CLOSED - this.hovered.children("a").removeClass("hover ui-state-hover").addClass( this.settings.ui.theme_name == "themeroller" ? "hover ui-state-hover" : "hover"); - - // SCROLL SELECTED NODE INTO VIEW - var off_t = this.hovered.offset().top; - var beg_t = this.container.offset().top; - var end_t = beg_t + this.container.height(); - var h_cor = (this.container.get(0).scrollWidth > this.container.width()) ? 40 : 20; - if(off_t + 5 < beg_t) this.container.scrollTop(this.container.scrollTop() - (beg_t - off_t + 5) ); - if(off_t + h_cor > end_t) this.container.scrollTop(this.container.scrollTop() + (off_t + h_cor - end_t) ); - }, - select_branch : function (obj, multiple) { - if(this.locked) return this.error("LOCKED"); - if(!obj && this.hovered !== false) obj = this.hovered; - var _this = this; - obj = _this.get_node(obj); - if(!obj.size()) return this.error("SELECT: NOT A VALID NODE"); - obj.children("a").removeClass("hover ui-state-hover"); - // CHECK AGAINST RULES FOR SELECTABLE NODES - if(!_this.check("clickable", obj)) return this.error("SELECT: NODE NOT SELECTABLE"); - if(_this.settings.callback.beforechange.call(null,obj.get(0),_this) === false) return this.error("SELECT: STOPPED BY USER"); - // IF multiple AND obj IS ALREADY SELECTED - DESELECT IT - if(this.settings.rules.multiple != false && multiple && obj.children("a.clicked").size() > 0) { - return this.deselect_branch(obj); - } - if(this.settings.rules.multiple != false && multiple) { - this.selected_arr.push(obj); - } - if(this.settings.rules.multiple != false && !multiple) { - for(var i in this.selected_arr) { - if(typeof this.selected_arr[i] == "function") continue; - this.selected_arr[i].children("A").removeClass("clicked ui-state-active"); - this.settings.callback.ondeselect.call(null, this.selected_arr[i].get(0), _this); - } - this.selected_arr = []; - this.selected_arr.push(obj); - if(this.selected && this.selected.children("A").hasClass("clicked")) { - this.selected.children("A").removeClass("clicked ui-state-active"); - this.settings.callback.ondeselect.call(null, this.selected.get(0), _this); - } - } - if(!this.settings.rules.multiple) { - if(this.selected) { - this.selected.children("A").removeClass("clicked ui-state-active"); - this.settings.callback.ondeselect.call(null, this.selected.get(0), _this); - } - } - // SAVE NEWLY SELECTED - this.selected = obj; - if( (this.settings.ui.hover_mode || this.settings.ui.theme_name == "themeroller") && this.hovered !== false) { - this.hovered.children("A").removeClass("hover ui-state-hover"); - this.hovered = obj; - } - - // FOCUS NEW NODE AND OPEN ALL PARENT NODES IF CLOSED - this.selected.children("a").removeClass("clicked ui-state-active").addClass( this.settings.ui.theme_name == "themeroller" ? "clicked ui-state-active" : "clicked").end().parents("li.closed").each( function () { _this.open_branch(this, true); }); - - // SCROLL SELECTED NODE INTO VIEW - var off_t = this.selected.offset().top; - var beg_t = this.container.offset().top; - var end_t = beg_t + this.container.height(); - var h_cor = (this.container.get(0).scrollWidth > this.container.width()) ? 40 : 20; - if(off_t + 5 < beg_t) this.container.scrollTop(this.container.scrollTop() - (beg_t - off_t + 5) ); - if(off_t + h_cor > end_t) this.container.scrollTop(this.container.scrollTop() + (off_t + h_cor - end_t) ); - - this.set_cookie("selected"); - this.settings.callback.onselect.call(null, this.selected.get(0), _this); - this.settings.callback.onchange.call(null, this.selected.get(0), _this); - }, - deselect_branch : function (obj) { - if(this.locked) return this.error("LOCKED"); - var _this = this; - var obj = this.get_node(obj); - obj.children("a").removeClass("clicked ui-state-active"); - this.settings.callback.ondeselect.call(null, obj.get(0), _this); - if(this.settings.rules.multiple != false && this.selected_arr.length > 1) { - this.selected_arr = []; - this.container.find("a.clicked").filter(":first-child").parent().each(function () { - _this.selected_arr.push($(this)); - }); - if(obj.get(0) == this.selected.get(0)) { - this.selected = this.selected_arr[0]; - this.set_cookie("selected"); - } - } - else { - if(this.settings.rules.multiple != false) this.selected_arr = []; - this.selected = false; - this.set_cookie("selected"); - } - if(this.selected) this.settings.callback.onchange.call(null, this.selected.get(0), _this); - else this.settings.callback.onchange.call(null, false, _this); - }, - toggle_branch : function (obj) { - if(this.locked) return this.error("LOCKED"); - var obj = this.get_node(obj); - if(obj.hasClass("closed")) return this.open_branch(obj); - if(obj.hasClass("open")) return this.close_branch(obj); - }, - open_branch : function (obj, disable_animation, callback) { - if(this.locked) return this.error("LOCKED"); - var obj = this.get_node(obj); - if(!obj.size()) return this.error("OPEN: NO SUCH NODE"); - if(obj.hasClass("leaf")) return this.error("OPEN: OPENING LEAF NODE"); - - if(this.settings.data.async && obj.find("li").size() == 0) { - if(this.settings.callback.beforeopen.call(null,obj.get(0),this) === false) return this.error("OPEN: STOPPED BY USER"); - var _this = this; - obj.children("ul:eq(0)").remove().end().append(""); - obj.removeClass("closed").addClass("open"); - if(this.settings.data.type == "xml_flat" || this.settings.data.type == "xml_nested") { - var xsl = (this.settings.data.type == "xml_flat") ? "flat.xsl" : "nested.xsl"; - obj.children("ul:eq(0)").getTransform(this.path + xsl, this.settings.data.url, { params : { theme_path : _this.theme }, meth : this.settings.data.method, dat : this.settings.data.async_data(obj, this), repl : true, - callback: function (str, json) { - if(str.length < 15) { - obj.removeClass("closed").removeClass("open").addClass("leaf").children("ul").remove(); - if(callback) callback.call(); - return; - } - _this.open_branch.apply(_this, [obj]); - if(callback) callback.call(); - }, - error : function () { obj.removeClass("open").addClass("closed").children("ul:eq(0)").remove(); } - }); - } - else { - $.ajax({ - type : this.settings.data.method, - url : this.settings.data.url, - data : this.settings.data.async_data(obj, this), - dataType : "json", - success : function (data, textStatus) { - data = _this.settings.callback.onJSONdata.call(null, data, _this); - if(!data || data.length == 0) { - obj.removeClass("closed").removeClass("open").addClass("leaf").children("ul").remove(); - if(callback) callback.call(); - return; - } - var str = ""; - if(data.length) { - for(var i = 0; i < data.length; i++) { - str += _this.parseJSON(data[i]); - } - } - else str = _this.parseJSON(data); - if(str.length > 0) { - obj.children("ul:eq(0)").replaceWith("
          " + str + "
        "); - obj.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed"); - obj.find("li").not(".open").not(".closed").addClass("leaf"); - _this.open_branch.apply(_this, [obj]); - } - else obj.removeClass("closed").removeClass("open").addClass("leaf").children("ul").remove(); - if(callback) callback.call(); - }, - error : function (xhttp, textStatus, errorThrown) { obj.removeClass("open").addClass("closed").children("ul:eq(0)").remove(); _this.error(errorThrown + " " + textStatus); } - }); - } - return true; - } - else { - if(!this.settings.data.async) { - if(this.settings.callback.beforeopen.call(null,obj.get(0),this) === false) return this.error("OPEN: STOPPED BY USER"); - } - if(this.settings.ui.theme_name == "themeroller") obj.find("a").not(".ui-state-default").addClass("ui-state-default"); - if(parseInt(this.settings.ui.animation) > 0 && !disable_animation ) { - obj.children("ul:eq(0)").css("display","none"); - obj.removeClass("closed").addClass("open"); - obj.children("ul:eq(0)").slideDown(parseInt(this.settings.ui.animation), function() { - $(this).css("display",""); - if(callback) callback.call(); - }); - } else { - obj.removeClass("closed").addClass("open"); - if(callback) callback.call(); - } - this.set_cookie("open"); - this.settings.callback.onopen.call(null, obj.get(0), this); - return true; - } - }, - close_branch : function (obj, disable_animation) { - if(this.locked) return this.error("LOCKED"); - var _this = this; - var obj = this.get_node(obj); - if(!obj.size()) return this.error("CLOSE: NO SUCH NODE"); - if(_this.settings.callback.beforeclose.call(null,obj.get(0),_this) === false) return this.error("CLOSE: STOPPED BY USER"); - if(parseInt(this.settings.ui.animation) > 0 && !disable_animation && obj.children("ul:eq(0)").size() == 1) { - obj.children("ul:eq(0)").slideUp(parseInt(this.settings.ui.animation), function() { - if(obj.hasClass("open")) obj.removeClass("open").addClass("closed"); - _this.set_cookie("open"); - $(this).css("display",""); - }); - } - else { - if(obj.hasClass("open")) obj.removeClass("open").addClass("closed"); - this.set_cookie("open"); - } - if(this.selected && obj.children("ul:eq(0)").find("a.clicked").size() > 0) { - obj.find("li:has(a.clicked)").each(function() { - _this.deselect_branch(this); - }); - if(obj.children("a.clicked").size() == 0) this.select_branch(obj, (this.settings.rules.multiple != false && this.selected_arr.length > 0) ); - } - this.settings.callback.onclose.call(null, obj.get(0), this); - }, - open_all : function (obj, callback) { - if(this.locked) return this.error("LOCKED"); - var _this = this; - obj = obj ? this.get_node(obj).parent() : this.container; - - var s = obj.find("li.closed").size(); - if(!callback) this.cl_count = 0; - else this.cl_count --; - if(s > 0) { - this.cl_count += s; - obj.find("li.closed").each( function () { var __this = this; _this.open_branch.apply(_this, [this, true, function() { _this.open_all.apply(_this, [__this, true]); } ]); }); - } - else if(this.cl_count == 0) this.settings.callback.onopen_all.call(null,this); - }, - close_all : function () { - if(this.locked) return this.error("LOCKED"); - var _this = this; - this.container.find("li.open").each( function () { _this.close_branch(this, true); }); - }, - show_lang : function (i) { - if(this.locked) return this.error("LOCKED"); - if(this.settings.languages[i] == this.current_lang) return true; - var st = false; - var id = this.container.attr("id") ? "#" + this.container.attr("id") : ".tree"; - st = get_css(id + " ." + this.current_lang, this.sn); - if(st !== false) st.style.display = "none"; - st = get_css(id + " ." + this.settings.languages[i], this.sn); - if(st !== false) st.style.display = ""; - this.current_lang = this.settings.languages[i]; - return true; - }, - cycle_lang : function() { - if(this.locked) return this.error("LOCKED"); - var i = $.inArray(this.current_lang, this.settings.languages); - i ++; - if(i > this.settings.languages.length - 1) i = 0; - this.show_lang(i); - }, - create : function (obj, ref_node, position) { - if(this.locked) return this.error("LOCKED"); - - var root = false; - if(ref_node == -1) { root = true; ref_node = this.container; } - else ref_node = ref_node ? this.get_node(ref_node) : this.selected; - - if(!root && (!ref_node || !ref_node.size())) return this.error("CREATE: NO NODE SELECTED"); - - var pos = position; - - var tmp = ref_node; // for type calculation - if(position == "before") { - position = ref_node.parent().children().index(ref_node); - ref_node = ref_node.parents("li:eq(0)"); - } - if(position == "after") { - position = ref_node.parent().children().index(ref_node) + 1; - ref_node = ref_node.parents("li:eq(0)"); - } - if(!root && ref_node.size() == 0) { root = true; ref_node = this.container; } - - if(!root) { - if(!this.check("creatable", ref_node)) return this.error("CREATE: CANNOT CREATE IN NODE"); - if(ref_node.hasClass("closed")) { - if(this.settings.data.async && ref_node.children("ul").size() == 0) { - var _this = this; - return this.open_branch(ref_node, true, function () { _this.create.apply(_this, [obj, ref_node, position]); } ); - } - else this.open_branch(ref_node, true); - } - } - - // creating new object to pass to parseJSON - var torename = false; - if(!obj) obj = {}; - else obj = $.extend(true, {}, obj); - if(!obj.attributes) obj.attributes = {}; - if(this.settings.rules.metadata) { - if(!obj.attributes[this.settings.rules.metadata]) obj.attributes[this.settings.rules.metadata] = '{ "type" : "' + (this.get_type(tmp) || "") + '" }'; - } - else { - if(!obj.attributes[this.settings.rules.type_attr]) obj.attributes[this.settings.rules.type_attr] = this.get_type(tmp) || ""; - } - if(this.settings.languages.length) { - if(!obj.data) { obj.data = {}; torename = true; } - for(var i = 0; i < this.settings.languages.length; i++) { - if(!obj.data[this.settings.languages[i]]) obj.data[this.settings.languages[i]] = ((typeof this.settings.lang.new_node).toLowerCase() != "string" && this.settings.lang.new_node[i]) ? this.settings.lang.new_node[i] : this.settings.lang.new_node; - } - } - else { - if(!obj.data) { obj.data = this.settings.lang.new_node; torename = true; } - } - - var $li = $(this.parseJSON(obj)); - if($li.children("ul").size()) { - if(!$li.is(".open")) $li.addClass("closed"); - } - else $li.addClass("leaf"); - $li.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed"); - $li.find("li").not(".open").not(".closed").addClass("leaf"); - - if(!root && this.settings.rules.use_inline && this.settings.rules.metadata) { - var t = this.get_type($li) || ""; - $.metadata.setType("attr", this.settings.rules.metadata); - if(typeof ref_node.metadata()["valid_children"] != "undefined") { - if($.inArray(t, ref_node.metadata()["valid_children"]) == -1) return this.error("CREATE: NODE NOT A VALID CHILD"); - } - if(typeof ref_node.metadata()["max_children"] != "undefined") { - if( (ref_node.children("ul:eq(0)").children("li").size() + 1) > ref_node.metadata().max_children) return this.error("CREATE: MAX_CHILDREN REACHED"); - } - var ok = true; - if((typeof $(ref_node).metadata().max_depth).toLowerCase() != "undefined" && $(ref_node).metadata().max_depth === 0) ok = false; - else { - ref_node.parents("li").each(function(i) { - if($(this).metadata().max_depth) { - if( (i + 1) >= $(this).metadata().max_depth) { - ok = false; - return false; - } - } - }); - } - if(!ok) return this.error("CREATE: MAX_DEPTH REACHED"); - } - - if((typeof position).toLowerCase() == "undefined" || position == "inside") - position = (this.settings.rules.createat == "top") ? 0 : ref_node.children("ul:eq(0)").children("li").size(); - if(ref_node.children("ul").size() == 0 || (root == true && ref_node.children("ul").children("li").size() == 0) ) { - if(!root) var a = this.moved($li,ref_node.children("a:eq(0)"),"inside", true); - else var a = this.moved($li,this.container.children("ul:eq(0)"),"inside", true); - } - else if(pos == "before" && ref_node.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").size()) - var a = this.moved($li,ref_node.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").children("a:eq(0)"),"before", true); - else if(pos == "after" && ref_node.children("ul:eq(0)").children("li:nth-child(" + (position) + ")").size()) - var a = this.moved($li,ref_node.children("ul:eq(0)").children("li:nth-child(" + (position) + ")").children("a:eq(0)"),"after", true); - else if(ref_node.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").size()) - var a = this.moved($li,ref_node.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").children("a:eq(0)"),"before", true); - else - var a = this.moved($li,ref_node.children("ul:eq(0)").children("li:last").children("a:eq(0)"),"after",true); - - if(a === false) return this.error("CREATE: ABORTED"); - - if(torename) { - this.select_branch($li.children("a:eq(0)")); - this.rename(); - } - return $li; - }, - rename : function (obj) { - if(this.locked) return this.error("LOCKED"); - obj = obj ? this.get_node(obj) : this.selected; - var _this = this; - if(!obj || !obj.size()) return this.error("RENAME: NO NODE SELECTED"); - if(!this.check("renameable", obj)) return this.error("RENAME: NODE NOT RENAMABLE"); - if(!this.settings.callback.beforerename.call(null,obj.get(0), _this.current_lang, _this)) return this.error("RENAME: STOPPED BY USER"); - - obj.parents("li.closed").each(function () { _this.open_branch(this) }); - if(this.current_lang) obj = obj.find("a." + this.current_lang).get(0); - else obj = obj.find("a:first").get(0); - last_value = obj.innerHTML; - _this.inp = $(""); - _this.inp - .val(last_value.replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<")) - .bind("mousedown", function (event) { event.stopPropagation(); }) - .bind("mouseup", function (event) { event.stopPropagation(); }) - .bind("click", function (event) { event.stopPropagation(); }) - .bind("keyup", function (event) { - var key = event.keyCode || event.which; - if(key == 27) { this.value = last_value; this.blur(); return } - if(key == 13) { this.blur(); return } - }); - - // Rollback - var rb = {}; - rb[this.container.attr("id")] = this.get_rollback(); - - _this.inp.blur(function(event) { - if(this.value == "") this.value = last_value; - $(obj).text( $(obj).parent().find("input").eq(0).attr("value") ).get(0).style.display = ""; - $(obj).prevAll("span").remove(); - _this.settings.callback.onrename.call(null, _this.get_node(obj).get(0), _this.current_lang, _this, rb); - _this.inp = false; - }); - var spn = $("").addClass(obj.className).append(_this.inp); - spn.attr("style", $(obj).attr("style")); - obj.style.display = "none"; - $(obj).parent().prepend(spn); - _this.inp.get(0).focus(); - _this.inp.get(0).select(); - }, - // REMOVE NODES - remove : function(obj) { - if(this.locked) return this.error("LOCKED"); - - // Rollback - var rb = {}; - rb[this.container.attr("id")] = this.get_rollback(); - - if(obj && (!this.selected || this.get_node(obj).get(0) != this.selected.get(0) )) { - obj = this.get_node(obj); - if(obj.size()) { - if(!this.check("deletable", obj)) return this.error("DELETE: NODE NOT DELETABLE"); - if(!this.settings.callback.beforedelete.call(null,obj.get(0), _this)) return this.error("DELETE: STOPPED BY USER"); - $parent = obj.parent(); - obj = obj.remove(); - $parent.children("li:last").addClass("last"); - if($parent.children("li").size() == 0) { - $li = $parent.parents("li:eq(0)"); - $li.removeClass("open").removeClass("closed").addClass("leaf").children("ul").remove(); - this.set_cookie("open"); - } - this.settings.callback.ondelete.call(null, obj.get(0), this, rb); - } - } - else if(this.selected) { - if(!this.check("deletable", this.selected)) return this.error("DELETE: NODE NOT DELETABLE"); - if(!this.settings.callback.beforedelete.call(null,this.selected.get(0), _this)) return this.error("DELETE: STOPPED BY USER"); - $parent = this.selected.parent(); - var obj = this.selected; - if(this.settings.rules.multiple == false || this.selected_arr.length == 1) { - var stop = true; - var tmp = (this.selected.prev("li:eq(0)").size()) ? this.selected.prev("li:eq(0)") : this.selected.parents("li:eq(0)"); - // this.get_prev(true); - } - obj = obj.remove(); - $parent.children("li:last").addClass("last"); - if($parent.children("li").size() == 0) { - $li = $parent.parents("li:eq(0)"); - $li.removeClass("open").removeClass("closed").addClass("leaf").children("ul").remove(); - this.set_cookie("open"); - } - //this.selected = false; - this.settings.callback.ondelete.call(null, obj.get(0), this, rb); - if(stop && tmp) this.select_branch(tmp); - if(this.settings.rules.multiple != false && !stop) { - var _this = this; - this.selected_arr = []; - this.container.find("a.clicked").filter(":first-child").parent().each(function () { - _this.selected_arr.push($(this)); - }); - if(this.selected_arr.length > 0) { - this.selected = this.selected_arr[0]; - this.remove(); - } - } - } - else return this.error("DELETE: NO NODE SELECTED"); - }, - - next : function (obj, strict) { - obj = this.get_node(obj); - if(!obj.size()) return false; - if(strict) return (obj.nextAll("li").size() > 0) ? obj.nextAll("li:eq(0)") : false; - - if(obj.hasClass("open")) return obj.find("li:eq(0)"); - else if(obj.nextAll("li").size() > 0) return obj.nextAll("li:eq(0)"); - else return obj.parents("li").next("li").eq(0); - }, - prev : function(obj, strict) { - obj = this.get_node(obj); - if(!obj.size()) return false; - if(strict) return (obj.prevAll("li").size() > 0) ? obj.prevAll("li:eq(0)") : false; - - if(obj.prev("li").size()) { - var obj = obj.prev("li").eq(0); - while(obj.hasClass("open")) obj = obj.children("ul:eq(0)").children("li:last"); - return obj; - } - else return obj.parents("li:eq(0)").size() ? obj.parents("li:eq(0)") : false; - }, - parent : function(obj) { - obj = this.get_node(obj); - if(!obj.size()) return false; - return obj.parents("li:eq(0)").size() ? obj.parents("li:eq(0)") : false; - }, - children : function(obj) { - obj = this.get_node(obj); - if(!obj.size()) return false; - return obj.children("ul:eq(0)").children("li"); - }, - - // FOR EXPLORER-LIKE KEYBOARD SHORTCUTS - get_next : function(force) { - var obj = this.hovered || this.selected; - return force ? this.select_branch(this.next(obj)) : this.hover_branch(this.next(obj)); - }, - get_prev : function(force) { - var obj = this.hovered || this.selected; - return force ? this.select_branch(this.prev(obj)) : this.hover_branch(this.prev(obj)); - }, - get_left : function(force, rtl) { - if(this.settings.ui.rtl && !rtl) return this.get_right(force, true); - var obj = this.hovered || this.selected; - if(obj) { - if(obj.hasClass("open")) this.close_branch(obj); - else { - return force ? this.select_branch(this.parent(obj)) : this.hover_branch(this.parent(obj)); - } - } - }, - get_right : function(force, rtl) { - if(this.settings.ui.rtl && !rtl) return this.get_left(force, true); - var obj = this.hovered || this.selected; - if(obj) { - if(obj.hasClass("closed")) this.open_branch(obj); - else { - return force ? this.select_branch(obj.find("li:eq(0)")) : this.hover_branch(obj.find("li:eq(0)")); - } - } - }, - toggleDots : function () { - if(this.settings.ui.dots) { - this.settings.ui.dots = false; - this.container.children("ul:eq(0)").addClass("no_dots"); - } - else { - this.settings.ui.dots = true; - this.container.children("ul:eq(0)").removeClass("no_dots"); - } - }, - toggleRTL : function () { - if(this.settings.ui.rtl) { - this.settings.ui.rtl = false; - this.container.css("direction","ltr").children("ul:eq(0)").removeClass("rtl").addClass("ltr"); - } - else { - this.settings.ui.rtl = true; - this.container.css("direction","rtl").children("ul:eq(0)").removeClass("ltr").addClass("rtl"); - } - }, - set_cookie : function (type) { - if(this.settings.cookies === false) return false; - if(this.settings.cookies[type] === false) return false; - switch(type) { - case "selected": - if(this.settings.rules.multiple != false && this.selected_arr.length > 1) { - var val = Array(); - $.each(this.selected_arr, function () { - if(this.attr("id")) { val.push(this.attr("id")); } - }); - val = val.join(","); - } - else var val = this.selected ? this.selected.attr("id") : false; - $.cookie(this.settings.cookies.prefix + '_selected',val,this.settings.cookies.opts); - break; - case "open": - var str = ""; - this.container.find("li.open").each(function (i) { if(this.id) { str += this.id + ","; } }); - $.cookie(this.settings.cookies.prefix + '_open',str.replace(/,$/ig,""),this.settings.cookies.opts); - break; - } - }, - get_rollback : function () { - var rb = {}; - if(this.context.to_remove && this.context.apply_to) this.context.apply_to.children("a").removeClass("clicked"); - rb.html = this.container.html(); - if(this.context.to_remove && this.context.apply_to) this.context.apply_to.children("a").addClass("clicked"); - rb.selected = this.selected ? this.selected.attr("id") : false; - return rb; - }, - moved : function (what, where, how, is_new, is_copy, rb) { - var what = $(what); - var $parent = $(what).parents("ul:eq(0)"); - var $where = $(where); - - // Rollback - if(!rb) { - var rb = {}; - rb[this.container.attr("id")] = this.get_rollback(); - if(!is_new) { - var tmp = what.size() > 1 ? what.eq(0).parents(".tree:eq(0)") : what.parents(".tree:eq(0)"); - if(tmp.get(0) != this.container.get(0)) { - tmp = tree_component.inst[tmp.attr("id")]; - rb[tmp.container.attr("id")] = tmp.get_rollback(); - } - delete tmp; - } - } - - if(how == "inside" && this.settings.data.async && this.get_node($where).hasClass("closed")) { - var _this = this; - return this.open_branch(this.get_node($where), true, function () { _this.moved.apply(_this, [what, where, how, is_new, is_copy, rb]); }); - } - - // IF MULTIPLE - if(what.size() > 1) { - var _this = this; - var tmp = this.moved(what.eq(0), where, how, false, is_copy, rb); - what.each(function (i) { - if(i == 0) return; - if(tmp) { // if tmp is false - the previous move was a no-go - tmp = _this.moved(this, tmp.children("a:eq(0)"), "after", false, is_copy, rb); - } - }); - return; - } - - if(is_copy) { - _what = what.clone(); - _what.each(function (i) { - this.id = this.id + "_copy"; - $(this).find("li").each(function () { - this.id = this.id + "_copy"; - }); - $(this).removeClass("dragged").find("a.clicked").removeClass("clicked ui-state-active").end().find("li.dragged").removeClass("dragged"); - }); - } - else _what = what; - if(is_new) { - if(!this.settings.callback.beforecreate.call(null,this.get_node(what).get(0), this.get_node(where).get(0),how,this)) return false; - } - else { - if(!this.settings.callback.beforemove.call(null,this.get_node(what).get(0), this.get_node(where).get(0),how,this)) return false; - } - - if(!is_new) { - var tmp = what.parents(".tree:eq(0)"); - // if different trees - if(tmp.get(0) != this.container.get(0)) { - tmp = tree_component.inst[tmp.attr("id")]; - - // if there are languages - otherwise - no cleanup needed - if(tmp.settings.languages.length) { - var res = []; - // if new tree has no languages - use current visible - if(this.settings.languages.length == 0) res.push("." + tmp.current_lang); - else { - for(var i in this.settings.languages) { - if(typeof this.settings.languages[i] == "function") continue; - for(var j in tmp.settings.languages) { - if(typeof tmp.settings.languages[j] == "function") continue; - if(this.settings.languages[i] == tmp.settings.languages[j]) res.push("." + this.settings.languages[i]); - } - } - } - if(res.length == 0) return this.error("MOVE: NO COMMON LANGUAGES"); - what.find("a").not(res.join(",")).remove(); - } - what.find("a.clicked").removeClass("clicked ui-state-active"); - } - } - what = _what; - - // ADD NODE TO NEW PLACE - switch(how) { - case "before": - $where.parents("ul:eq(0)").children("li.last").removeClass("last"); - $where.parent().before(what.removeClass("last")); - $where.parents("ul:eq(0)").children("li:last").addClass("last"); - break; - case "after": - $where.parents("ul:eq(0)").children("li.last").removeClass("last"); - $where.parent().after(what.removeClass("last")); - $where.parents("ul:eq(0)").children("li:last").addClass("last"); - break; - case "inside": - if($where.parent().children("ul:first").size()) { - if(this.settings.rules.createat == "top") $where.parent().children("ul:first").prepend(what.removeClass("last")).children("li:last").addClass("last"); - else $where.parent().children("ul:first").children(".last").removeClass("last").end().append(what.removeClass("last")).children("li:last").addClass("last"); - } - else { - what.addClass("last"); - $where.parent().append("
          ").removeClass("leaf").addClass("closed"); - $where.parent().children("ul:first").prepend(what); - } - if($where.parent().hasClass("closed")) { this.open_branch($where); } - break; - default: - break; - } - // CLEANUP OLD PARENT - if($parent.find("li").size() == 0) { - var $li = $parent.parent(); - $li.removeClass("open").removeClass("closed").addClass("leaf"); - if(!$li.is(".tree")) $li.children("ul").remove(); - $li.parents("ul:eq(0)").children("li.last").removeClass("last").end().children("li:last").addClass("last"); - this.set_cookie("open"); - } - else { - $parent.children("li.last").removeClass("last"); - $parent.children("li:last").addClass("last"); - } - - // NO LONGER CORRECT WITH position PARAM - if(is_new && how != "inside") where = this.get_node(where).parents("li:eq(0)"); - if(is_copy) this.settings.callback.oncopy.call(null, this.get_node(what).get(0), this.get_node(where).get(0), how, this, rb); - else if(is_new) this.settings.callback.oncreate.call(null, this.get_node(what).get(0), ($where.is("ul") ? -1 : this.get_node(where).get(0) ), how, this, rb); - else this.settings.callback.onmove.call(null, this.get_node(what).get(0), this.get_node(where).get(0), how, this, rb); - return what; - }, - error : function (code) { - this.settings.callback.error.call(null,code,this); - return false; - }, - lock : function (state) { - this.locked = state; - if(this.locked) this.container.children("ul:eq(0)").addClass("locked"); - else this.container.children("ul:eq(0)").removeClass("locked"); - }, - cut : function (obj) { - if(this.locked) return this.error("LOCKED"); - obj = obj ? this.get_node(obj) : this.container.find("a.clicked").filter(":first-child").parent(); - if(!obj || !obj.size()) return this.error("CUT: NO NODE SELECTED"); - this.copy_nodes = false; - this.cut_nodes = obj; - }, - copy : function (obj) { - if(this.locked) return this.error("LOCKED"); - obj = obj ? this.get_node(obj) : this.container.find("a.clicked").filter(":first-child").parent(); - if(!obj || !obj.size()) return this.error("COPY: NO NODE SELECTED"); - this.copy_nodes = obj; - this.cut_nodes = false; - }, - paste : function (obj, position) { - if(this.locked) return this.error("LOCKED"); - - var root = false; - if(obj == -1) { root = true; obj = this.container; } - else obj = obj ? this.get_node(obj) : this.selected; - - if(!root && (!obj || !obj.size())) return this.error("PASTE: NO NODE SELECTED"); - if(!this.copy_nodes && !this.cut_nodes) return this.error("PASTE: NOTHING TO DO"); - - var _this = this; - - var pos = position; - - if(position == "before") { - position = obj.parent().children().index(obj); - obj = obj.parents("li:eq(0)"); - } - else if(position == "after") { - position = obj.parent().children().index(obj) + 1; - obj = obj.parents("li:eq(0)"); - } - else if((typeof position).toLowerCase() == "undefined" || position == "inside") { - position = (this.settings.rules.createat == "top") ? 0 : obj.children("ul:eq(0)").children("li").size(); - } - if(!root && obj.size() == 0) { root = true; obj = this.container; } - - if(this.copy_nodes && this.copy_nodes.size()) { - var ok = true; - // This is copy - why forbid this? - //obj.parents().andSelf().each(function () { - // if(_this.copy_nodes.index(this) != -1) { - // ok = false; - // return false; - // } - //}); - if(!ok) return this.error("Invalid paste"); - if(!root && !this.checkMove(this.copy_nodes, obj.children("a:eq(0)"), "inside")) return false; - - if(obj.children("ul").size() == 0 || (root == true && obj.children("ul").children("li").size() == 0) ) { - if(!root) var a = this.moved(this.copy_nodes,obj.children("a:eq(0)"),"inside", false, true); - else var a = this.moved(this.copy_nodes,this.container.children("ul:eq(0)"),"inside", false, true); - } - else if(pos == "before" && obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").size()) - var a = this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").children("a:eq(0)"),"before", false, true); - else if(pos == "after" && obj.children("ul:eq(0)").children("li:nth-child(" + (position) + ")").size()) - var a = this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:nth-child(" + (position) + ")").children("a:eq(0)"),"after", false, true); - else if(obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").size()) - var a = this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").children("a:eq(0)"),"before", false, true); - else - var a = this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:last").children("a:eq(0)"),"after", false, true); - this.copy_nodes = false; - } - if(this.cut_nodes && this.cut_nodes.size()) { - var ok = true; - obj.parents().andSelf().each(function () { - if(_this.cut_nodes.index(this) != -1) { - ok = false; - return false; - } - }); - if(!ok) return this.error("Invalid paste"); - if(!root && !this.checkMove(this.cut_nodes, obj.children("a:eq(0)"), "inside")) return false; - - if(obj.children("ul").size() == 0 || (root == true && obj.children("ul").children("li").size() == 0) ) { - if(!root) var a = this.moved(this.cut_nodes,obj.children("a:eq(0)"),"inside"); - else var a = this.moved(this.cut_nodes,this.container.children("ul:eq(0)"),"inside"); - } - else if(pos == "before" && obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").size()) - var a = this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").children("a:eq(0)"),"before"); - else if(pos == "after" && obj.children("ul:eq(0)").children("li:nth-child(" + (position) + ")").size()) - var a = this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:nth-child(" + (position) + ")").children("a:eq(0)"),"after"); - else if(obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").size()) - var a = this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:nth-child(" + (position + 1) + ")").children("a:eq(0)"),"before"); - else - var a = this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:last").children("a:eq(0)"),"after"); - this.cut_nodes = false; - } - }, - search : function(str) { - var _this = this; - if(!str || (this.srch && str != this.srch) ) { - this.srch = ""; - this.srch_opn = false; - this.container.find("a.search").removeClass("search ui-state-highlight"); - } - this.srch = str; - if(!str) return; - if(this.settings.data.async) { - if(!this.srch_opn) { - var dd = $.extend( { "search" : str } , this.settings.data.async_data(false, this) ); - $.ajax({ - type : this.settings.data.method, - url : this.settings.data.url, - data : dd, - dataType : "text", - success : function (data) { - _this.srch_opn = $.unique(data.split(",")); - _this.search.apply(_this,[str]); - } - }); - } - else if(this.srch_opn.length) { - if(this.srch_opn && this.srch_opn.length) { - var opn = false; - for(var j = 0; j < this.srch_opn.length; j++) { - if(this.get_node("#" + this.srch_opn[j]).size() > 0) { - opn = true; - var tmp = "#" + this.srch_opn[j]; - delete this.srch_opn[j]; - this.open_branch(tmp, true, function () { _this.search.apply(_this,[str]); } ); - } - } - if(!opn) { - this.srch_opn = []; - _this.search.apply(_this,[str]); - } - } - } - else { - var selector = "a"; - // IF LANGUAGE VERSIONS - if(this.settings.languages.length) selector += "." + this.current_lang; - this.container.find(selector + ":contains('" + str + "')").addClass( this.settings.ui.theme_name == "themeroller" ? "search ui-state-highlight" : "search"); - this.srch_opn = false; - } - } - else { - var selector = "a"; - // IF LANGUAGE VERSIONS - if(this.settings.languages.length) selector += "." + this.current_lang; - this.container.find(selector + ":contains('" + str + "')").addClass( this.settings.ui.theme_name == "themeroller" ? "search ui-state-highlight" : "search").parents("li.closed").each( function () { _this.open_branch(this, true); }); - } - }, - - destroy : function() { - this.hide_context(); - this.container.unbind(".jstree"); - $("#" + this.container.attr("id")).die("click.jstree").die("dblclick.jstree").die("contextmenu.jstree").die("mouseover.jstree").die("mouseout.jstree").die("mousedown.jstree"); - this.container.removeClass("tree ui-widget ui-widget-content tree-default tree-" + this.settings.ui.theme_name).children("ul").removeClass("no_dots rtl ltr locked").find("li").removeClass("leaf").removeClass("open").removeClass("closed").removeClass("last").children("a").removeClass("clicked hover search ui-state-active ui-state-hover ui-state-highlight ui-state-default"); - - if(this.cntr == tree_component.focused) { - for(var i in tree_component.inst) { - if(i != this.cntr && i != this.container.attr("id")) { - tree_component.inst[i].focus(); - break; - } - } - } - - tree_component.inst[this.cntr] = false; - tree_component.inst[this.container.attr("id")] = false; - delete tree_component.inst[this.cntr]; - delete tree_component.inst[this.container.attr("id")]; - tree_component.cntr --; - } - } - }; -})(jQuery); \ No newline at end of file diff --git a/umbraco/presentation/umbraco_client/Tree/tree_component.min.js b/umbraco/presentation/umbraco_client/Tree/tree_component.min.js deleted file mode 100644 index 682704401a..0000000000 --- a/umbraco/presentation/umbraco_client/Tree/tree_component.min.js +++ /dev/null @@ -1,14 +0,0 @@ -/* - * jsTree 0.9.8 - * http://jstree.com/ - * - * Copyright (c) 2009 Ivan Bozhanov (vakata.com) - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Date: 2009-05-15 - * - */ -(function($){$.fn.tree=function(opts){return this.each(function(){var conf=$.extend({},opts);if(tree_component.inst&&tree_component.inst[$(this).attr('id')])tree_component.inst[$(this).attr('id')].destroy();if(conf!==false)new tree_component().init(this,conf)})};$.tree_create=function(){return new tree_component()};$.tree_focused=function(){return tree_component.inst[tree_component.focused]};$.tree_reference=function(id){return tree_component.inst[id]||null};$.tree_rollback=function(data){for(var i in data){if(typeof data[i]=="function")continue;var tmp=tree_component.inst[i];var lock=!tmp.locked;if(lock)tmp.lock(true);if(tmp.inp)tmp.inp.val("").blur();tmp.context.append=false;tmp.container.html(data[i].html).find(".dragged").removeClass("dragged").end().find("div.context").remove();if(data[i].selected){tmp.selected=$("#"+data[i].selected);tmp.selected_arr=[];tmp.container.find("a.clicked").each(function(){tmp.selected_arr.push(tmp.get_node(this))})}if(lock)tmp.lock(false);delete lock;delete tmp}};function tree_component(){if(typeof tree_component.inst=="undefined"){tree_component.cntr=0;tree_component.inst={};tree_component.drag_drop={isdown:false,drag_node:false,drag_help:false,init_x:false,init_y:false,moving:false,origin_tree:false,marker:false,move_type:false,ref_node:false,appended:false,foreign:false,droppable:[],open_time:false,scroll_time:false};tree_component.mousedown=function(event){var tmp=$(event.target);if(tree_component.drag_drop.droppable.length&&tmp.is("."+tree_component.drag_drop.droppable.join(", ."))){tree_component.drag_drop.drag_help=$("");tree_component.drag_drop.drag_node=tree_component.drag_drop.drag_help.find("li:eq(0)");tree_component.drag_drop.isdown=true;tree_component.drag_drop.foreign=tmp;tmp.blur();event.preventDefault();event.stopPropagation();return false}event.stopPropagation();return true};tree_component.mouseup=function(event){var tmp=tree_component.drag_drop;if(tmp.open_time)clearTimeout(tmp.open_time);if(tmp.scroll_time)clearTimeout(tmp.scroll_time);if(tmp.foreign===false&&tmp.drag_node&&tmp.drag_node.size()){tmp.drag_help.remove();if(tmp.move_type){var tree1=tree_component.inst[tmp.ref_node.parents(".tree:eq(0)").attr("id")];if(tree1)tree1.moved(tmp.origin_tree.container.find("li.dragged"),tmp.ref_node,tmp.move_type,false,(tmp.origin_tree.settings.rules.drag_copy=="on"||(tmp.origin_tree.settings.rules.drag_copy=="ctrl"&&event.ctrlKey)))}tmp.move_type=false;tmp.ref_node=false}if(tmp.drag_node&&tmp.foreign!==false){tmp.drag_help.remove();if(tmp.move_type){var tree1=tree_component.inst[tmp.ref_node.parents(".tree:eq(0)").attr("id")];if(tree1)tree1.settings.callback.ondrop.call(null,tmp.foreign.get(0),tree1.get_node(tmp.ref_node).get(0),tmp.move_type,tree1)}tmp.foreign=false;tmp.move_type=false;tmp.ref_node=false}tree_component.drag_drop.marker.hide();tmp.drag_help=false;tmp.drag_node=false;tmp.isdown=false;tmp.init_x=false;tmp.init_y=false;tmp.moving=false;tmp.appended=false;$("li.dragged").removeClass("dragged");tmp.origin_tree=false;event.preventDefault();event.stopPropagation();return false};tree_component.mousemove=function(event){var tmp=tree_component.drag_drop;if(tmp.isdown){if(!tmp.moving&&Math.abs(tmp.init_x-event.pageX)<5&&Math.abs(tmp.init_y-event.pageY)<5){event.preventDefault();event.stopPropagation();return false}else tree_component.drag_drop.moving=true;if(tmp.open_time)clearTimeout(tmp.open_time);if(!tmp.appended){if(tmp.foreign!==false)tmp.origin_tree=$.tree_focused();$("body").append(tmp.drag_help);tmp.w=tmp.drag_help.width();tmp.appended=true}tmp.drag_help.css({"left":(event.pageX-(tmp.origin_tree.settings.ui.rtl?tmp.w:-5)),"top":(event.pageY+15)});if(event.target.tagName=="IMG"&&event.target.id=="marker")return false;var et=$(event.target);var cnt=et.is(".tree")?et:et.parents(".tree:eq(0)");if(cnt.size()==0||!tree_component.inst[cnt.attr("id")]){if(tmp.scroll_time)clearTimeout(tmp.scroll_time);if(tmp.drag_help.find("IMG").size()==0){tmp.drag_help.find("li:eq(0)").append("")}tmp.move_type=false;tmp.ref_node=false;tree_component.drag_drop.marker.hide();return false}var tree2=tree_component.inst[cnt.attr("id")];tree2.off_height();if(tmp.foreign===false&&tmp.origin_tree.container.get(0)!=tree2.container.get(0)&&(!tmp.origin_tree.settings.rules.multitree||!tree2.settings.rules.multitree)){if(tmp.drag_help.find("IMG").size()==0){tmp.drag_help.find("li:eq(0)").append("")}tmp.move_type=false;tmp.ref_node=false;tree_component.drag_drop.marker.hide();return false}if(tmp.scroll_time)clearTimeout(tmp.scroll_time);tmp.scroll_time=setTimeout(function(){tree2.scrollCheck(event.pageX,event.pageY)},50);var mov=false;var st=cnt.scrollTop();if(event.target.tagName=="A"){if(et.is("#jstree-dragged"))return false;if(tree2.get_node(event.target).hasClass("closed")){tmp.open_time=setTimeout(function(){tree2.open_branch(et)},500)}var et_off=et.offset();var goTo={x:(et_off.left-1),y:(event.pageY-et_off.top)};if(cnt.children("ul:eq(0)").hasClass("rtl"))goTo.x+=et.width()-8;var arr=[];if(goTo.ytree2.li_height*2/3-1)arr=["after","inside","before"];else{if(goTo.y")}tmp.move_type=false;tmp.ref_node=false;tree_component.drag_drop.marker.hide()}event.preventDefault();event.stopPropagation();return false}return true}};return{cntr:++tree_component.cntr,settings:{data:{type:"predefined",method:"GET",async:false,async_data:function(NODE,TREE_OBJ){return{id:$(NODE).attr("id")||0}},url:false,json:false,xml:false},selected:false,opened:[],languages:[],path:false,cookies:false,ui:{dots:true,rtl:false,animation:0,hover_mode:true,scroll_spd:4,theme_path:false,theme_name:"default",context:[{id:"create",label:"Create",icon:"create.png",visible:function(NODE,TREE_OBJ){if(NODE.length!=1)return false;return TREE_OBJ.check("creatable",NODE)},action:function(NODE,TREE_OBJ){TREE_OBJ.create(false,TREE_OBJ.get_node(NODE[0]))}},"separator",{id:"rename",label:"Rename",icon:"rename.png",visible:function(NODE,TREE_OBJ){if(NODE.length!=1)return false;return TREE_OBJ.check("renameable",NODE)},action:function(NODE,TREE_OBJ){TREE_OBJ.rename(NODE)}},{id:"delete",label:"Delete",icon:"remove.png",visible:function(NODE,TREE_OBJ){var ok=true;$.each(NODE,function(){if(TREE_OBJ.check("deletable",this)==false)ok=false;return false});return ok},action:function(NODE,TREE_OBJ){$.each(NODE,function(){TREE_OBJ.remove(this)})}}]},rules:{multiple:false,metadata:false,type_attr:"rel",multitree:false,createat:"bottom",use_inline:false,clickable:"all",renameable:"all",deletable:"all",creatable:"all",draggable:"none",dragrules:"all",drag_copy:false,droppable:[],drag_button:"left"},lang:{new_node:"New folder",loading:"Loading ..."},callback:{beforechange:function(NODE,TREE_OBJ){return true},beforeopen:function(NODE,TREE_OBJ){return true},beforeclose:function(NODE,TREE_OBJ){return true},beforemove:function(NODE,REF_NODE,TYPE,TREE_OBJ){return true},beforecreate:function(NODE,REF_NODE,TYPE,TREE_OBJ){return true},beforerename:function(NODE,LANG,TREE_OBJ){return true},beforedelete:function(NODE,TREE_OBJ){return true},onJSONdata:function(DATA,TREE_OBJ){return DATA},onselect:function(NODE,TREE_OBJ){},ondeselect:function(NODE,TREE_OBJ){},onchange:function(NODE,TREE_OBJ){},onrename:function(NODE,LANG,TREE_OBJ,RB){},onmove:function(NODE,REF_NODE,TYPE,TREE_OBJ,RB){},oncopy:function(NODE,REF_NODE,TYPE,TREE_OBJ,RB){},oncreate:function(NODE,REF_NODE,TYPE,TREE_OBJ,RB){},ondelete:function(NODE,TREE_OBJ,RB){},onopen:function(NODE,TREE_OBJ){},onopen_all:function(TREE_OBJ){},onclose:function(NODE,TREE_OBJ){},error:function(TEXT,TREE_OBJ){},ondblclk:function(NODE,TREE_OBJ){TREE_OBJ.toggle_branch.call(TREE_OBJ,NODE);TREE_OBJ.select_branch.call(TREE_OBJ,NODE)},onrgtclk:function(NODE,TREE_OBJ,EV){},onload:function(TREE_OBJ){},onfocus:function(TREE_OBJ){},ondrop:function(NODE,REF_NODE,TYPE,TREE_OBJ){}}},init:function(elem,conf){var _this=this;this.container=$(elem);if(this.container.size==0){alert("Invalid container node!");return}tree_component.inst[this.cntr]=this;if(!this.container.attr("id"))this.container.attr("id","jstree_"+this.cntr);tree_component.inst[this.container.attr("id")]=tree_component.inst[this.cntr];tree_component.focused=this.cntr;var opts=$.extend({},conf);if(opts&&opts.cookies){this.settings.cookies=$.extend({},this.settings.cookies,opts.cookies);delete opts.cookies;if(!this.settings.cookies.opts)this.settings.cookies.opts={}}if(opts&&opts.callback){this.settings.callback=$.extend({},this.settings.callback,opts.callback);delete opts.callback}if(opts&&opts.data){this.settings.data=$.extend({},this.settings.data,opts.data);delete opts.data}if(opts&&opts.ui){this.settings.ui=$.extend({},this.settings.ui,opts.ui);delete opts.ui}if(opts&&opts.rules){this.settings.rules=$.extend({},this.settings.rules,opts.rules);delete opts.rules}if(opts&&opts.lang){this.settings.lang=$.extend({},this.settings.lang,opts.lang);delete opts.lang}this.settings=$.extend({},this.settings,opts);if(this.settings.path==false){this.path="";$("script").each(function(){if(this.src.toString().match(/tree_component.*?js$/)){_this.path=this.src.toString().replace(/tree_component.*?js$/,"")}})}else this.path=this.settings.path;this.current_lang=this.settings.languages&&this.settings.languages.length?this.settings.languages[0]:false;if(this.settings.languages&&this.settings.languages.length){this.sn=get_sheet_num("tree_component.css");if(this.sn===false&&document.styleSheets.length)this.sn=document.styleSheets.length;var st=false;var id=this.container.attr("id")?"#"+this.container.attr("id"):".tree";for(var ln=0;ln").attr({id:"marker",src:_this.settings.ui.theme_path+"marker.gif"}).css({height:"5px",width:"40px",display:"block",position:"absolute",left:"30px",top:"30px",zIndex:"1000"}).hide().appendTo("body")}this.refresh();this.attachEvents();this.focus()},off_height:function(){if(this.offset===false){this.container.css({position:"relative"});this.offset=this.container.offset();var tmp=0;tmp=parseInt($.curCSS(this.container.get(0),"paddingTop",true),10);if(tmp)this.offset.top+=tmp;tmp=parseInt($.curCSS(this.container.get(0),"borderTopWidth",true),10);if(tmp)this.offset.top+=tmp;this.container.css({position:""})}if(!this.li_height){var tmp=this.container.find("ul li.closed, ul li.leaf").eq(0);this.li_height=tmp.height();if(tmp.children("ul:eq(0)").size())this.li_height-=tmp.children("ul:eq(0)").height();if(!this.li_height)this.li_height=18}},context_menu:function(){this.context=false;if(this.settings.ui.context!=false){var str='
          ';for(var i in this.settings.ui.context){if(typeof this.settings.ui.context[i]=="function")continue;if(this.settings.ui.context[i]=="separator"){str+=" ";continue}var icn="";if(this.settings.ui.context[i].icon)icn='background-image:url(\''+(this.settings.ui.context[i].icon.indexOf("/")==-1?this.theme+this.settings.ui.context[i].icon:this.settings.ui.context[i].icon)+'\');';str+=''+this.settings.ui.context[i].label+''}str+='
          ';this.context=$(str);this.context.hide();this.context.append=false}},refresh:function(obj){if(this.locked)return this.error("LOCKED");var _this=this;this.is_partial_refresh=obj?true:false;this.opened=Array();if(this.settings.cookies&&$.cookie(this.settings.cookies.prefix+'_open')){var str=$.cookie(this.settings.cookies.prefix+'_open');var tmp=str.split(",");$.each(tmp,function(){if(this.replace(/^#/,"").length>0){_this.opened.push("#"+this.replace(/^#/,""))}});this.settings.opened=false}else if(this.settings.opened!=false){$.each(this.settings.opened,function(i,item){if(this.replace(/^#/,"").length>0){_this.opened.push("#"+this.replace(/^#/,""))}});this.settings.opened=false}else{this.container.find("li.open").each(function(i){if(this.id){_this.opened.push("#"+this.id)}})}if(this.selected){this.settings.selected=Array();if(obj){$(obj).find("li:has(a.clicked)").each(function(){$this=$(this);if($this.attr("id"))_this.settings.selected.push("#"+$this.attr("id"))})}else{if(this.selected_arr){$.each(this.selected_arr,function(){if(this.attr("id"))_this.settings.selected.push("#"+this.attr("id"))})}else{if(this.selected.attr("id"))this.settings.selected.push("#"+this.selected.attr("id"))}}}else if(this.settings.cookies&&$.cookie(this.settings.cookies.prefix+'_selected')){this.settings.selected=Array();var str=$.cookie(this.settings.cookies.prefix+'_selected');var tmp=str.split(",");$.each(tmp,function(){if(this.replace(/^#/,"").length>0){_this.settings.selected.push("#"+this.replace(/^#/,""))}})}else if(this.settings.selected!==false){var tmp=Array();if((typeof this.settings.selected).toLowerCase()=="object"){$.each(this.settings.selected,function(){if(this.replace(/^#/,"").length>0)tmp.push("#"+this.replace(/^#/,""))})}else{if(this.settings.selected.replace(/^#/,"").length>0)tmp.push("#"+this.settings.selected.replace(/^#/,""))}this.settings.selected=tmp}if(obj&&this.settings.data.async){this.opened=Array();obj=this.get_node(obj);obj.find("li.open").each(function(i){_this.opened.push("#"+this.id)});if(obj.hasClass("open"))obj.removeClass("open").addClass("closed");if(obj.hasClass("leaf"))obj.removeClass("leaf");obj.children("ul:eq(0)").html("");return this.open_branch(obj,true,function(){_this.reselect.apply(_this)})}if(this.settings.data.type=="xml_flat"||this.settings.data.type=="xml_nested"){this.scrtop=this.container.get(0).scrollTop;var xsl=(this.settings.data.type=="xml_flat")?"flat.xsl":"nested.xsl";if(this.settings.data.xml)this.container.getTransform(this.path+xsl,this.settings.data.xml,{params:{theme_name:_this.settings.ui.theme_name,theme_path:_this.theme},meth:_this.settings.data.method,dat:_this.settings.data.async_data.apply(_this,[obj,_this]),callback:function(){_this.context_menu.apply(_this);_this.reselect.apply(_this)}});else this.container.getTransform(this.path+xsl,this.settings.data.url,{params:{theme_name:_this.settings.ui.theme_name,theme_path:_this.theme},meth:_this.settings.data.method,dat:_this.settings.data.async_data.apply(_this,[obj,_this]),callback:function(){_this.context_menu.apply(_this);_this.reselect.apply(_this)}});return}else if(this.settings.data.type=="json"){if(this.settings.data.json){var str="";if(this.settings.data.json.length){for(var i=0;i"+str+"
        ");this.container.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed");this.container.find("li").not(".open").not(".closed").addClass("leaf");this.context_menu();this.reselect()}else{var _this=this;$.ajax({type:this.settings.data.method,url:this.settings.data.url,data:this.settings.data.async_data(false,this),dataType:"json",success:function(data){data=_this.settings.callback.onJSONdata.call(null,data,_this);var str="";if(data.length){for(var i=0;i"+str+"
      ");_this.container.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed");_this.container.find("li").not(".open").not(".closed").addClass("leaf");_this.context_menu.apply(_this);_this.reselect.apply(_this)},error:function(xhttp,textStatus,errorThrown){_this.error(errorThrown+" "+textStatus)}})}}else{this.container.children("ul:eq(0)");this.container.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed");this.container.find("li").not(".open").not(".closed").addClass("leaf");this.reselect()}},parseJSON:function(data){if(!data||!data.data)return"";var str="";str+="
    •  "}str+=((typeof data.data[this.settings.languages[i]].title).toLowerCase()!="undefined"?data.data[this.settings.languages[i]].title:data.data[this.settings.languages[i]])+""}}else{var attr={};attr["href"]="#";attr["style"]="";attr["class"]="";if((typeof data.data.attributes).toLowerCase()!="undefined"){for(var i in data.data.attributes){if(typeof data.data.attributes[i]=="function")continue;if(i=="style"||i=="class")attr[i]+=" "+data.data.attributes[i];else attr[i]=data.data.attributes[i]}}if(data.data.icon&&this.settings.ui.theme_name!="themeroller"){var icn=data.data.icon.indexOf("/")==-1?this.theme+data.data.icon:data.data.icon;attr["style"]+=" ; background-image:url('"+icn+"');"}str+=" "}str+=((typeof data.data.title).toLowerCase()!="undefined"?data.data.title:data.data)+""}if(data.children&&data.children.length){str+='
        ';for(var i=0;i'}str+="";return str},getJSON:function(nod,outer_attrib,inner_attrib,force){var _this=this;if(!nod||$(nod).size()==0){nod=this.container.children("ul").children("li")}else nod=$(nod);if(nod.size()>1){var arr=[];nod.each(function(){arr.push(_this.getJSON(this,outer_attrib,inner_attrib,force))});return arr}if(!outer_attrib)outer_attrib=["id","rel","class"];if(!inner_attrib)inner_attrib=[];var obj={attributes:{},data:false};for(var i in outer_attrib){if(typeof outer_attrib[i]=="function")continue;var val=(outer_attrib[i]=="class")?nod.attr(outer_attrib[i]).replace("last","").replace("leaf","").replace("closed","").replace("open",""):nod.attr(outer_attrib[i]);if(typeof val!="undefined"&&val.replace(" ","").length>0)obj.attributes[outer_attrib[i]]=val;delete val}if(this.settings.languages.length){obj.data={};for(var i in this.settings.languages){if(typeof this.settings.languages[i]=="function")continue;var a=nod.children("a."+this.settings.languages[i]);if(force||inner_attrib.length||a.get(0).style.backgroundImage.toString().length){obj.data[this.settings.languages[i]]={};obj.data[this.settings.languages[i]].title=a.text();if(a.get(0).style.backgroundImage.length){obj.data[this.settings.languages[i]].icon=a.get(0).style.backgroundImage.replace("url(","").replace(")","")}if(this.settings.ui.theme_name=="themeroller"&&a.children("ins").size()){var tmp=a.children("ins").attr("class");var cls=false;$.each(tmp.split(" "),function(i,val){if(val.indexOf("ui-icon-")==0){cls=val;return false}});if(cls)obj.data[this.settings.languages[i]].icon=cls}if(inner_attrib.length){obj.data[this.settings.languages[i]].attributes={};for(var j in inner_attrib){if(typeof inner_attrib[j]=="function")continue;var val=a.attr(inner_attrib[j]);if(typeof val!="undefined"&&val.replace(" ","").length>0)obj.data[this.settings.languages[i]].attributes[inner_attrib[j]]=val;delete val}}}else{obj.data[this.settings.languages[i]]=a.text()}}}else{var a=nod.children("a");if(force||inner_attrib.length||a.get(0).style.backgroundImage.toString().length){obj.data={};obj.data.title=a.text();if(a.get(0).style.backgroundImage.length){obj.data.icon=a.get(0).style.backgroundImage.replace("url(","").replace(")","")}if(this.settings.ui.theme_name=="themeroller"&&a.children("ins").size()){var tmp=a.children("ins").attr("class");var cls=false;$.each(tmp.split(" "),function(i,val){if(val.indexOf("ui-icon-")==0){cls=val;return false}});if(cls)obj.data[this.settings.languages[i]].icon=cls}if(inner_attrib.length){obj.data.attributes={};for(var j in inner_attrib){if(typeof inner_attrib[j]=="function")continue;var val=a.attr(inner_attrib[j]);if(typeof val!="undefined"&&val.replace(" ","").length>0)obj.data.attributes[inner_attrib[j]]=val;delete val}}}else{obj.data=a.text()}}if(nod.children("ul").size()>0){obj.children=[];nod.children("ul").children("li").each(function(){obj.children.push(_this.getJSON(this,outer_attrib,inner_attrib,force))})}return obj},getXML:function(tp,nod,outer_attrib,inner_attrib,cb){var _this=this;if(tp!="flat")tp="nested";if(!nod||$(nod).size()==0){nod=this.container.children("ul").children("li")}else nod=$(nod);if(nod.size()>1){var obj='';nod.each(function(){obj+=_this.getXML(tp,this,outer_attrib,inner_attrib,true)});obj+='';return obj}if(!outer_attrib)outer_attrib=["id","rel","class"];if(!inner_attrib)inner_attrib=[];var obj='';if(!cb)obj='';obj+='0)obj+=' '+outer_attrib[i]+'="'+val+'" ';delete val}obj+='>';obj+='';if(this.settings.languages.length){for(var i in this.settings.languages){if(typeof this.settings.languages[i]=="function")continue;var a=nod.children("a."+this.settings.languages[i]);obj+='0)obj+=' '+inner_attrib[j]+'="'+val+'" ';delete val}}}obj+='>'}}else{var a=nod.children("a");obj+='0)obj+=' '+inner_attrib[j]+'="'+val+'" ';delete val}}}obj+='>'}obj+='';if(tp=="flat")obj+='';if(nod.children("ul").size()>0){nod.children("ul").children("li").each(function(){obj+=_this.getXML(tp,this,outer_attrib,inner_attrib,true)})}if(tp=="nested")obj+='';if(!cb)obj+='';return obj},focus:function(){if(this.locked)return false;if(tree_component.focused!=this.cntr){tree_component.focused=this.cntr;this.settings.callback.onfocus.call(null,this)}},show_context:function(obj){this.context.show();var tmp=$(obj).children("a:visible").offset();this.context.css({"left":(tmp.left),"top":(tmp.top+parseInt(obj.children("a:visible").height())+2)})},hide_context:function(){if(this.context.to_remove&&this.context.apply_to)this.context.apply_to.children("a").removeClass("clicked");this.context.apply_to=false;this.context.hide()},attachEvents:function(){var _this=this;this.container.bind("mousedown.jstree",function(event){if(tree_component.drag_drop.isdown){tree_component.drag_drop.move_type=false;event.preventDefault();event.stopPropagation();event.stopImmediatePropagation();return false}}).bind("mouseup.jstree",function(event){setTimeout(function(){_this.focus.apply(_this)},5)}).bind("click.jstree",function(event){return true});$("#"+this.container.attr("id")+" li").live("click",function(event){if(event.target.tagName!="LI")return true;_this.off_height();if(event.pageY-$(event.target).offset().top>_this.li_height)return true;_this.toggle_branch.apply(_this,[event.target]);event.stopPropagation();return false});$("#"+this.container.attr("id")+" li a").live("click.jstree",function(event){if(event.which&&event.which==3)return true;if(_this.locked){event.preventDefault();event.target.blur();return _this.error("LOCKED")}_this.select_branch.apply(_this,[event.target,event.ctrlKey||_this.settings.rules.multiple=="on"]);if(_this.inp){_this.inp.blur()}event.preventDefault();event.target.blur();return false}).live("dblclick.jstree",function(event){if(_this.locked){event.preventDefault();event.stopPropagation();event.target.blur();return _this.error("LOCKED")}_this.settings.callback.ondblclk.call(null,_this.get_node(event.target).get(0),_this);event.preventDefault();event.stopPropagation();event.target.blur()}).live("contextmenu.jstree",function(event){if(_this.locked){event.target.blur();return _this.error("LOCKED")}var val=_this.settings.callback.onrgtclk.call(null,_this.get_node(event.target).get(0),_this,event);if(_this.context){if(_this.context.append==false){$("body").append(_this.context);_this.context.append=true;for(var i in _this.settings.ui.context){if(typeof _this.settings.ui.context[i]=="function")continue;if(_this.settings.ui.context[i]=="separator")continue;(function(){var func=_this.settings.ui.context[i].action;_this.context.children("[rel="+_this.settings.ui.context[i].id+"]").bind("click",function(event){if(!$(this).hasClass("disabled")){func.call(null,_this.context.apply_to||null,_this);_this.hide_context()}event.stopPropagation();event.preventDefault();return false}).bind("mouseup",function(event){this.blur();if($(this).hasClass("disabled")){event.stopPropagation();event.preventDefault();return false}}).bind("mousedown",function(event){event.stopPropagation();event.preventDefault()})})()}}var obj=_this.get_node(event.target);if(_this.inp){_this.inp.blur()}if(obj){if(!obj.children("a:eq(0)").hasClass("clicked")){_this.context.apply_to=obj;_this.context.to_remove=true;_this.context.apply_to.children("a").addClass("clicked");event.target.blur()}else{_this.context.to_remove=false;_this.context.apply_to=(_this.selected_arr&&_this.selected_arr.length>1)?_this.selected_arr:_this.selected}_this.context.children("a").removeClass("disabled").show();var go=false;for(var i in _this.settings.ui.context){if(typeof _this.settings.ui.context[i]=="function")continue;if(_this.settings.ui.context[i]=="separator")continue;var state=_this.settings.ui.context[i].visible.call(null,_this.context.apply_to,_this);if(state===false)_this.context.children("[rel="+_this.settings.ui.context[i].id+"]").addClass("disabled");if(state===-1)_this.context.children("[rel="+_this.settings.ui.context[i].id+"]").hide();else go=true}if(go==true)_this.show_context(obj);event.preventDefault();event.stopPropagation();return false}}return val}).live("mouseover.jstree",function(event){if(_this.locked){event.preventDefault();event.stopPropagation();return _this.error("LOCKED")}if((_this.settings.ui.hover_mode||_this.settings.ui.theme_name=="themeroller")&&_this.hovered!==false&&event.target.tagName=="A"){_this.hovered.children("a").removeClass("hover ui-state-hover");_this.hovered=false}if(_this.settings.ui.theme_name=="themeroller"){_this.hover_branch.apply(_this,[event.target])}});if(_this.settings.ui.theme_name=="themeroller"){$("#"+this.container.attr("id")+" li a").live("mouseout",function(event){if(_this.hovered)_this.hovered.children("a").removeClass("hover ui-state-hover")})}if(this.settings.rules.draggable!="none"){$("#"+this.container.attr("id")+" li a").live("mousedown.jstree",function(event){if(_this.settings.rules.drag_button=="left"&&event.which&&event.which!=1)return true;if(_this.settings.rules.drag_button=="right"&&event.which&&event.which!=3)return true;_this.focus.apply(_this);if(_this.locked)return _this.error("LOCKED");var obj=_this.get_node(event.target);if(_this.settings.rules.multiple!=false&&_this.selected_arr.length>1&&obj.children("a:eq(0)").hasClass("clicked")){var counter=0;for(var i in _this.selected_arr){if(typeof _this.selected_arr[i]=="function")continue;if(_this.check("draggable",_this.selected_arr[i])){_this.selected_arr[i].addClass("dragged");tree_component.drag_drop.origin_tree=_this;counter++}}if(counter>0){if(_this.check("draggable",obj))tree_component.drag_drop.drag_node=obj;else tree_component.drag_drop.drag_node=_this.container.find("li.dragged:eq(0)");tree_component.drag_drop.isdown=true;tree_component.drag_drop.drag_help=$("
        ").append("
          ");var tmp=$(tree_component.drag_drop.drag_node.get(0).cloneNode(true));if(_this.settings.languages.length>0)tmp.find("a").not("."+_this.current_lang).hide();tree_component.drag_drop.drag_help.children("ul:eq(0)").append(tmp);tree_component.drag_drop.drag_help.find("li:eq(0)").removeClass("last").addClass("last").children("a").html("Multiple selection").end().children("ul").remove()}}else{if(_this.check("draggable",obj)){tree_component.drag_drop.drag_node=obj;tree_component.drag_drop.drag_help=$("
          ").append("
            ");var tmp=$(obj.get(0).cloneNode(true));if(_this.settings.languages.length>0)tmp.find("a").not("."+_this.current_lang).hide();tree_component.drag_drop.drag_help.children("ul:eq(0)").append(tmp);tree_component.drag_drop.drag_help.find("li:eq(0)").removeClass("last").addClass("last");tree_component.drag_drop.isdown=true;tree_component.drag_drop.foreign=false;tree_component.drag_drop.origin_tree=_this;obj.addClass("dragged")}}tree_component.drag_drop.init_x=event.pageX;tree_component.drag_drop.init_y=event.pageY;obj.blur();event.preventDefault();event.stopPropagation();return false});$(document).bind("mousedown.jstree",tree_component.mousedown).bind("mouseup.jstree",tree_component.mouseup).bind("mousemove.jstree",tree_component.mousemove)}if(_this.context)$(document).bind("mousedown",function(){_this.hide_context()})},checkMove:function(NODES,REF_NODE,TYPE){if(this.locked)return this.error("LOCKED");var _this=this;if(REF_NODE.parents("li.dragged").size()>0||REF_NODE.is(".dragged"))return this.error("MOVE: NODE OVER SELF");if(NODES.size()==1){var NODE=NODES.eq(0);if(tree_component.drag_drop.foreign){if(this.settings.rules.droppable.length==0)return false;if(!NODE.is("."+this.settings.rules.droppable.join(", .")))return false;var ok=false;for(var i in this.settings.rules.droppable){if(typeof this.settings.rules.droppable[i]=="function")continue;if(NODE.is("."+this.settings.rules.droppable[i])){if(this.settings.rules.metadata){$.metadata.setType("attr",this.settings.rules.metadata);NODE.attr(this.settings.rules.metadata,"type: '"+this.settings.rules.droppable[i]+"'")}else{NODE.attr(this.settings.rules.type_attr,this.settings.rules.droppable[i])}ok=true;break}}if(!ok)return false}if(!this.check("dragrules",[NODE,TYPE,REF_NODE.parents("li:eq(0)")]))return this.error("MOVE: AGAINST DRAG RULES")}else{var ok=true;NODES.each(function(i){if(ok==false)return false;var ref=REF_NODE;var mv=TYPE;if(!_this.check.apply(_this,["dragrules",[$(this),mv,ref]]))ok=false});if(ok==false)return this.error("MOVE: AGAINST DRAG RULES")}if(this.settings.rules.use_inline&&this.settings.rules.metadata){var nd=false;if(TYPE=="inside")nd=REF_NODE.parents("li:eq(0)");else nd=REF_NODE.parents("li:eq(1)");if(nd.size()){if(typeof nd.metadata()["valid_children"]!="undefined"){var tmp=nd.metadata()["valid_children"];var ok=true;NODES.each(function(i){if(ok==false)return false;if($.inArray(_this.get_type(this),tmp)==-1)ok=false});if(ok==false)return this.error("MOVE: NOT A VALID CHILD")}if(typeof nd.metadata()["max_children"]!="undefined"){if((nd.children("ul:eq(0)").children("li").not(".dragged").size()+NODES.size())>nd.metadata().max_children)return this.error("MOVE: MAX CHILDREN REACHED")}var incr=0;NODES.each(function(j){var i=1;var t=$(this);while(i<100){t=t.children("ul").children("li");if(t.size()==0)break;i++}incr=Math.max(i,incr)});var ok=true;if((typeof $(nd).metadata().max_depth).toLowerCase()!="undefined"&&$(nd).metadata().max_depth=$(this).metadata().max_depth)ok=false}})}if(ok==false)return this.error("MOVE: MAX_DEPTH REACHED")}}return true},reselect:function(is_callback){var _this=this;if(!is_callback)this.cl_count=0;else this.cl_count--;if(this.opened&&this.opened.length){var opn=false;for(var j=0;this.opened&&j0){opn=true;var tmp=this.opened[j];delete this.opened[j];this.open_branch(tmp,true,function(){_this.reselect.apply(_this,[true])});this.cl_count++}}else this.open_branch(this.opened[j],true)}if(this.settings.data.async&&opn)return;delete this.opened}if(this.cl_count>0)return;if(this.settings.ui.rtl)this.container.css("direction","rtl").children("ul:eq(0)").addClass("rtl");else this.container.css("direction","ltr").children("ul:eq(0)").addClass("ltr");if(this.settings.ui.dots==false)this.container.children("ul:eq(0)").addClass("no_dots");if(this.scrtop){this.container.scrollTop(_this.scrtop);delete this.scrtop}if(this.settings.selected!==false){$.each(this.settings.selected,function(i){if(_this.is_partial_refresh)_this.select_branch($(_this.settings.selected[i],_this.container),(_this.settings.rules.multiple!==false));else _this.select_branch($(_this.settings.selected[i],_this.container),(_this.settings.rules.multiple!==false&&i>0))});this.settings.selected=false}if(this.settings.ui.theme_name=="themeroller")this.container.find("a").addClass("ui-state-default");this.settings.callback.onload.call(null,_this)},get_node:function(obj){var obj=$(obj);return obj.is("li")?obj:obj.parents("li:eq(0)")},get_type:function(obj){obj=!obj?this.selected:this.get_node(obj);if(!obj)return;if(this.settings.rules.metadata){$.metadata.setType("attr",this.settings.rules.metadata);var tmp=obj.metadata().type;if(tmp)return tmp}return obj.attr(this.settings.rules.type_attr)},scrollCheck:function(x,y){var _this=this;var cnt=_this.container;var off=_this.container.offset();var st=cnt.scrollTop();var sl=cnt.scrollLeft();var h_cor=(cnt.get(0).scrollWidth>cnt.width())?40:20;if(y-off.top<20)cnt.scrollTop(Math.max((st-_this.settings.ui.scroll_spd),0));if(cnt.height()-(y-off.top)this.container.width())?40:20;if(off_t+5end_t)this.container.scrollTop(this.container.scrollTop()+(off_t+h_cor-end_t))},select_branch:function(obj,multiple){if(this.locked)return this.error("LOCKED");if(!obj&&this.hovered!==false)obj=this.hovered;var _this=this;obj=_this.get_node(obj);if(!obj.size())return this.error("SELECT: NOT A VALID NODE");obj.children("a").removeClass("hover ui-state-hover");if(!_this.check("clickable",obj))return this.error("SELECT: NODE NOT SELECTABLE");if(_this.settings.callback.beforechange.call(null,obj.get(0),_this)===false)return this.error("SELECT: STOPPED BY USER");if(this.settings.rules.multiple!=false&&multiple&&obj.children("a.clicked").size()>0){return this.deselect_branch(obj)}if(this.settings.rules.multiple!=false&&multiple){this.selected_arr.push(obj)}if(this.settings.rules.multiple!=false&&!multiple){for(var i in this.selected_arr){if(typeof this.selected_arr[i]=="function")continue;this.selected_arr[i].children("A").removeClass("clicked ui-state-active");this.settings.callback.ondeselect.call(null,this.selected_arr[i].get(0),_this)}this.selected_arr=[];this.selected_arr.push(obj);if(this.selected&&this.selected.children("A").hasClass("clicked")){this.selected.children("A").removeClass("clicked ui-state-active");this.settings.callback.ondeselect.call(null,this.selected.get(0),_this)}}if(!this.settings.rules.multiple){if(this.selected){this.selected.children("A").removeClass("clicked ui-state-active");this.settings.callback.ondeselect.call(null,this.selected.get(0),_this)}}this.selected=obj;if((this.settings.ui.hover_mode||this.settings.ui.theme_name=="themeroller")&&this.hovered!==false){this.hovered.children("A").removeClass("hover ui-state-hover");this.hovered=obj}this.selected.children("a").removeClass("clicked ui-state-active").addClass(this.settings.ui.theme_name=="themeroller"?"clicked ui-state-active":"clicked").end().parents("li.closed").each(function(){_this.open_branch(this,true)});var off_t=this.selected.offset().top;var beg_t=this.container.offset().top;var end_t=beg_t+this.container.height();var h_cor=(this.container.get(0).scrollWidth>this.container.width())?40:20;if(off_t+5end_t)this.container.scrollTop(this.container.scrollTop()+(off_t+h_cor-end_t));this.set_cookie("selected");this.settings.callback.onselect.call(null,this.selected.get(0),_this);this.settings.callback.onchange.call(null,this.selected.get(0),_this)},deselect_branch:function(obj){if(this.locked)return this.error("LOCKED");var _this=this;var obj=this.get_node(obj);obj.children("a").removeClass("clicked ui-state-active");this.settings.callback.ondeselect.call(null,obj.get(0),_this);if(this.settings.rules.multiple!=false&&this.selected_arr.length>1){this.selected_arr=[];this.container.find("a.clicked").filter(":first-child").parent().each(function(){_this.selected_arr.push($(this))});if(obj.get(0)==this.selected.get(0)){this.selected=this.selected_arr[0];this.set_cookie("selected")}}else{if(this.settings.rules.multiple!=false)this.selected_arr=[];this.selected=false;this.set_cookie("selected")}if(this.selected)this.settings.callback.onchange.call(null,this.selected.get(0),_this);else this.settings.callback.onchange.call(null,false,_this)},toggle_branch:function(obj){if(this.locked)return this.error("LOCKED");var obj=this.get_node(obj);if(obj.hasClass("closed"))return this.open_branch(obj);if(obj.hasClass("open"))return this.close_branch(obj)},open_branch:function(obj,disable_animation,callback){if(this.locked)return this.error("LOCKED");var obj=this.get_node(obj);if(!obj.size())return this.error("OPEN: NO SUCH NODE");if(obj.hasClass("leaf"))return this.error("OPEN: OPENING LEAF NODE");if(this.settings.data.async&&obj.find("li").size()==0){if(this.settings.callback.beforeopen.call(null,obj.get(0),this)===false)return this.error("OPEN: STOPPED BY USER");var _this=this;obj.children("ul:eq(0)").remove().end().append("");obj.removeClass("closed").addClass("open");if(this.settings.data.type=="xml_flat"||this.settings.data.type=="xml_nested"){var xsl=(this.settings.data.type=="xml_flat")?"flat.xsl":"nested.xsl";obj.children("ul:eq(0)").getTransform(this.path+xsl,this.settings.data.url,{params:{theme_path:_this.theme},meth:this.settings.data.method,dat:this.settings.data.async_data(obj,this),repl:true,callback:function(str,json){if(str.length<15){obj.removeClass("closed").removeClass("open").addClass("leaf").children("ul").remove();if(callback)callback.call();return}_this.open_branch.apply(_this,[obj]);if(callback)callback.call()},error:function(){obj.removeClass("open").addClass("closed").children("ul:eq(0)").remove()}})}else{$.ajax({type:this.settings.data.method,url:this.settings.data.url,data:this.settings.data.async_data(obj,this),dataType:"json",success:function(data,textStatus){data=_this.settings.callback.onJSONdata.call(null,data,_this);if(!data||data.length==0){obj.removeClass("closed").removeClass("open").addClass("leaf").children("ul").remove();if(callback)callback.call();return}var str="";if(data.length){for(var i=0;i0){obj.children("ul:eq(0)").replaceWith("
              "+str+"
            ");obj.find("li:last-child").addClass("last").end().find("li:has(ul)").not(".open").addClass("closed");obj.find("li").not(".open").not(".closed").addClass("leaf");_this.open_branch.apply(_this,[obj])}else obj.removeClass("closed").removeClass("open").addClass("leaf").children("ul").remove();if(callback)callback.call()},error:function(xhttp,textStatus,errorThrown){obj.removeClass("open").addClass("closed").children("ul:eq(0)").remove();_this.error(errorThrown+" "+textStatus)}})}return true}else{if(!this.settings.data.async){if(this.settings.callback.beforeopen.call(null,obj.get(0),this)===false)return this.error("OPEN: STOPPED BY USER")}if(this.settings.ui.theme_name=="themeroller")obj.find("a").not(".ui-state-default").addClass("ui-state-default");if(parseInt(this.settings.ui.animation)>0&&!disable_animation){obj.children("ul:eq(0)").css("display","none");obj.removeClass("closed").addClass("open");obj.children("ul:eq(0)").slideDown(parseInt(this.settings.ui.animation),function(){$(this).css("display","");if(callback)callback.call()})}else{obj.removeClass("closed").addClass("open");if(callback)callback.call()}this.set_cookie("open");this.settings.callback.onopen.call(null,obj.get(0),this);return true}},close_branch:function(obj,disable_animation){if(this.locked)return this.error("LOCKED");var _this=this;var obj=this.get_node(obj);if(!obj.size())return this.error("CLOSE: NO SUCH NODE");if(_this.settings.callback.beforeclose.call(null,obj.get(0),_this)===false)return this.error("CLOSE: STOPPED BY USER");if(parseInt(this.settings.ui.animation)>0&&!disable_animation&&obj.children("ul:eq(0)").size()==1){obj.children("ul:eq(0)").slideUp(parseInt(this.settings.ui.animation),function(){if(obj.hasClass("open"))obj.removeClass("open").addClass("closed");_this.set_cookie("open");$(this).css("display","")})}else{if(obj.hasClass("open"))obj.removeClass("open").addClass("closed");this.set_cookie("open")}if(this.selected&&obj.children("ul:eq(0)").find("a.clicked").size()>0){obj.find("li:has(a.clicked)").each(function(){_this.deselect_branch(this)});if(obj.children("a.clicked").size()==0)this.select_branch(obj,(this.settings.rules.multiple!=false&&this.selected_arr.length>0))}this.settings.callback.onclose.call(null,obj.get(0),this)},open_all:function(obj,callback){if(this.locked)return this.error("LOCKED");var _this=this;obj=obj?this.get_node(obj).parent():this.container;var s=obj.find("li.closed").size();if(!callback)this.cl_count=0;else this.cl_count--;if(s>0){this.cl_count+=s;obj.find("li.closed").each(function(){var __this=this;_this.open_branch.apply(_this,[this,true,function(){_this.open_all.apply(_this,[__this,true])}])})}else if(this.cl_count==0)this.settings.callback.onopen_all.call(null,this)},close_all:function(){if(this.locked)return this.error("LOCKED");var _this=this;this.container.find("li.open").each(function(){_this.close_branch(this,true)})},show_lang:function(i){if(this.locked)return this.error("LOCKED");if(this.settings.languages[i]==this.current_lang)return true;var st=false;var id=this.container.attr("id")?"#"+this.container.attr("id"):".tree";st=get_css(id+" ."+this.current_lang,this.sn);if(st!==false)st.style.display="none";st=get_css(id+" ."+this.settings.languages[i],this.sn);if(st!==false)st.style.display="";this.current_lang=this.settings.languages[i];return true},cycle_lang:function(){if(this.locked)return this.error("LOCKED");var i=$.inArray(this.current_lang,this.settings.languages);i++;if(i>this.settings.languages.length-1)i=0;this.show_lang(i)},create:function(obj,ref_node,position){if(this.locked)return this.error("LOCKED");var root=false;if(ref_node==-1){root=true;ref_node=this.container}else ref_node=ref_node?this.get_node(ref_node):this.selected;if(!root&&(!ref_node||!ref_node.size()))return this.error("CREATE: NO NODE SELECTED");var pos=position;var tmp=ref_node;if(position=="before"){position=ref_node.parent().children().index(ref_node);ref_node=ref_node.parents("li:eq(0)")}if(position=="after"){position=ref_node.parent().children().index(ref_node)+1;ref_node=ref_node.parents("li:eq(0)")}if(!root&&ref_node.size()==0){root=true;ref_node=this.container}if(!root){if(!this.check("creatable",ref_node))return this.error("CREATE: CANNOT CREATE IN NODE");if(ref_node.hasClass("closed")){if(this.settings.data.async&&ref_node.children("ul").size()==0){var _this=this;return this.open_branch(ref_node,true,function(){_this.create.apply(_this,[obj,ref_node,position])})}else this.open_branch(ref_node,true)}}var torename=false;if(!obj)obj={};else obj=$.extend(true,{},obj);if(!obj.attributes)obj.attributes={};if(this.settings.rules.metadata){if(!obj.attributes[this.settings.rules.metadata])obj.attributes[this.settings.rules.metadata]='{ "type" : "'+(this.get_type(tmp)||"")+'" }'}else{if(!obj.attributes[this.settings.rules.type_attr])obj.attributes[this.settings.rules.type_attr]=this.get_type(tmp)||""}if(this.settings.languages.length){if(!obj.data){obj.data={};torename=true}for(var i=0;iref_node.metadata().max_children)return this.error("CREATE: MAX_CHILDREN REACHED")}var ok=true;if((typeof $(ref_node).metadata().max_depth).toLowerCase()!="undefined"&&$(ref_node).metadata().max_depth===0)ok=false;else{ref_node.parents("li").each(function(i){if($(this).metadata().max_depth){if((i+1)>=$(this).metadata().max_depth){ok=false;return false}}})}if(!ok)return this.error("CREATE: MAX_DEPTH REACHED")}if((typeof position).toLowerCase()=="undefined"||position=="inside")position=(this.settings.rules.createat=="top")?0:ref_node.children("ul:eq(0)").children("li").size();if(ref_node.children("ul").size()==0||(root==true&&ref_node.children("ul").children("li").size()==0)){if(!root)var a=this.moved($li,ref_node.children("a:eq(0)"),"inside",true);else var a=this.moved($li,this.container.children("ul:eq(0)"),"inside",true)}else if(pos=="before"&&ref_node.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").size())var a=this.moved($li,ref_node.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").children("a:eq(0)"),"before",true);else if(pos=="after"&&ref_node.children("ul:eq(0)").children("li:nth-child("+(position)+")").size())var a=this.moved($li,ref_node.children("ul:eq(0)").children("li:nth-child("+(position)+")").children("a:eq(0)"),"after",true);else if(ref_node.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").size())var a=this.moved($li,ref_node.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").children("a:eq(0)"),"before",true);else var a=this.moved($li,ref_node.children("ul:eq(0)").children("li:last").children("a:eq(0)"),"after",true);if(a===false)return this.error("CREATE: ABORTED");if(torename){this.select_branch($li.children("a:eq(0)"));this.rename()}return $li},rename:function(obj){if(this.locked)return this.error("LOCKED");obj=obj?this.get_node(obj):this.selected;var _this=this;if(!obj||!obj.size())return this.error("RENAME: NO NODE SELECTED");if(!this.check("renameable",obj))return this.error("RENAME: NODE NOT RENAMABLE");if(!this.settings.callback.beforerename.call(null,obj.get(0),_this.current_lang,_this))return this.error("RENAME: STOPPED BY USER");obj.parents("li.closed").each(function(){_this.open_branch(this)});if(this.current_lang)obj=obj.find("a."+this.current_lang).get(0);else obj=obj.find("a:first").get(0);last_value=obj.innerHTML;_this.inp=$("");_this.inp.val(last_value.replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<")).bind("mousedown",function(event){event.stopPropagation()}).bind("mouseup",function(event){event.stopPropagation()}).bind("click",function(event){event.stopPropagation()}).bind("keyup",function(event){var key=event.keyCode||event.which;if(key==27){this.value=last_value;this.blur();return}if(key==13){this.blur();return}});var rb={};rb[this.container.attr("id")]=this.get_rollback();_this.inp.blur(function(event){if(this.value=="")this.value=last_value;$(obj).text($(obj).parent().find("input").eq(0).attr("value")).get(0).style.display="";$(obj).prevAll("span").remove();_this.settings.callback.onrename.call(null,_this.get_node(obj).get(0),_this.current_lang,_this,rb);_this.inp=false});var spn=$("").addClass(obj.className).append(_this.inp);spn.attr("style",$(obj).attr("style"));obj.style.display="none";$(obj).parent().prepend(spn);_this.inp.get(0).focus();_this.inp.get(0).select()},remove:function(obj){if(this.locked)return this.error("LOCKED");var rb={};rb[this.container.attr("id")]=this.get_rollback();if(obj&&(!this.selected||this.get_node(obj).get(0)!=this.selected.get(0))){obj=this.get_node(obj);if(obj.size()){if(!this.check("deletable",obj))return this.error("DELETE: NODE NOT DELETABLE");if(!this.settings.callback.beforedelete.call(null,obj.get(0),_this))return this.error("DELETE: STOPPED BY USER");$parent=obj.parent();obj=obj.remove();$parent.children("li:last").addClass("last");if($parent.children("li").size()==0){$li=$parent.parents("li:eq(0)");$li.removeClass("open").removeClass("closed").addClass("leaf").children("ul").remove();this.set_cookie("open")}this.settings.callback.ondelete.call(null,obj.get(0),this,rb)}}else if(this.selected){if(!this.check("deletable",this.selected))return this.error("DELETE: NODE NOT DELETABLE");if(!this.settings.callback.beforedelete.call(null,this.selected.get(0),_this))return this.error("DELETE: STOPPED BY USER");$parent=this.selected.parent();var obj=this.selected;if(this.settings.rules.multiple==false||this.selected_arr.length==1){var stop=true;var tmp=(this.selected.prev("li:eq(0)").size())?this.selected.prev("li:eq(0)"):this.selected.parents("li:eq(0)")}obj=obj.remove();$parent.children("li:last").addClass("last");if($parent.children("li").size()==0){$li=$parent.parents("li:eq(0)");$li.removeClass("open").removeClass("closed").addClass("leaf").children("ul").remove();this.set_cookie("open")}this.settings.callback.ondelete.call(null,obj.get(0),this,rb);if(stop&&tmp)this.select_branch(tmp);if(this.settings.rules.multiple!=false&&!stop){var _this=this;this.selected_arr=[];this.container.find("a.clicked").filter(":first-child").parent().each(function(){_this.selected_arr.push($(this))});if(this.selected_arr.length>0){this.selected=this.selected_arr[0];this.remove()}}}else return this.error("DELETE: NO NODE SELECTED")},next:function(obj,strict){obj=this.get_node(obj);if(!obj.size())return false;if(strict)return(obj.nextAll("li").size()>0)?obj.nextAll("li:eq(0)"):false;if(obj.hasClass("open"))return obj.find("li:eq(0)");else if(obj.nextAll("li").size()>0)return obj.nextAll("li:eq(0)");else return obj.parents("li").next("li").eq(0)},prev:function(obj,strict){obj=this.get_node(obj);if(!obj.size())return false;if(strict)return(obj.prevAll("li").size()>0)?obj.prevAll("li:eq(0)"):false;if(obj.prev("li").size()){var obj=obj.prev("li").eq(0);while(obj.hasClass("open"))obj=obj.children("ul:eq(0)").children("li:last");return obj}else return obj.parents("li:eq(0)").size()?obj.parents("li:eq(0)"):false},parent:function(obj){obj=this.get_node(obj);if(!obj.size())return false;return obj.parents("li:eq(0)").size()?obj.parents("li:eq(0)"):false},children:function(obj){obj=this.get_node(obj);if(!obj.size())return false;return obj.children("ul:eq(0)").children("li")},get_next:function(force){var obj=this.hovered||this.selected;return force?this.select_branch(this.next(obj)):this.hover_branch(this.next(obj))},get_prev:function(force){var obj=this.hovered||this.selected;return force?this.select_branch(this.prev(obj)):this.hover_branch(this.prev(obj))},get_left:function(force,rtl){if(this.settings.ui.rtl&&!rtl)return this.get_right(force,true);var obj=this.hovered||this.selected;if(obj){if(obj.hasClass("open"))this.close_branch(obj);else{return force?this.select_branch(this.parent(obj)):this.hover_branch(this.parent(obj))}}},get_right:function(force,rtl){if(this.settings.ui.rtl&&!rtl)return this.get_left(force,true);var obj=this.hovered||this.selected;if(obj){if(obj.hasClass("closed"))this.open_branch(obj);else{return force?this.select_branch(obj.find("li:eq(0)")):this.hover_branch(obj.find("li:eq(0)"))}}},toggleDots:function(){if(this.settings.ui.dots){this.settings.ui.dots=false;this.container.children("ul:eq(0)").addClass("no_dots")}else{this.settings.ui.dots=true;this.container.children("ul:eq(0)").removeClass("no_dots")}},toggleRTL:function(){if(this.settings.ui.rtl){this.settings.ui.rtl=false;this.container.css("direction","ltr").children("ul:eq(0)").removeClass("rtl").addClass("ltr")}else{this.settings.ui.rtl=true;this.container.css("direction","rtl").children("ul:eq(0)").removeClass("ltr").addClass("rtl")}},set_cookie:function(type){if(this.settings.cookies===false)return false;if(this.settings.cookies[type]===false)return false;switch(type){case"selected":if(this.settings.rules.multiple!=false&&this.selected_arr.length>1){var val=Array();$.each(this.selected_arr,function(){if(this.attr("id")){val.push(this.attr("id"))}});val=val.join(",")}else var val=this.selected?this.selected.attr("id"):false;$.cookie(this.settings.cookies.prefix+'_selected',val,this.settings.cookies.opts);break;case"open":var str="";this.container.find("li.open").each(function(i){if(this.id){str+=this.id+","}});$.cookie(this.settings.cookies.prefix+'_open',str.replace(/,$/ig,""),this.settings.cookies.opts);break}},get_rollback:function(){var rb={};if(this.context.to_remove&&this.context.apply_to)this.context.apply_to.children("a").removeClass("clicked");rb.html=this.container.html();if(this.context.to_remove&&this.context.apply_to)this.context.apply_to.children("a").addClass("clicked");rb.selected=this.selected?this.selected.attr("id"):false;return rb},moved:function(what,where,how,is_new,is_copy,rb){var what=$(what);var $parent=$(what).parents("ul:eq(0)");var $where=$(where);if(!rb){var rb={};rb[this.container.attr("id")]=this.get_rollback();if(!is_new){var tmp=what.size()>1?what.eq(0).parents(".tree:eq(0)"):what.parents(".tree:eq(0)");if(tmp.get(0)!=this.container.get(0)){tmp=tree_component.inst[tmp.attr("id")];rb[tmp.container.attr("id")]=tmp.get_rollback()}delete tmp}}if(how=="inside"&&this.settings.data.async&&this.get_node($where).hasClass("closed")){var _this=this;return this.open_branch(this.get_node($where),true,function(){_this.moved.apply(_this,[what,where,how,is_new,is_copy,rb])})}if(what.size()>1){var _this=this;var tmp=this.moved(what.eq(0),where,how,false,is_copy,rb);what.each(function(i){if(i==0)return;if(tmp){tmp=_this.moved(this,tmp.children("a:eq(0)"),"after",false,is_copy,rb)}});return}if(is_copy){_what=what.clone();_what.each(function(i){this.id=this.id+"_copy";$(this).find("li").each(function(){this.id=this.id+"_copy"});$(this).removeClass("dragged").find("a.clicked").removeClass("clicked ui-state-active").end().find("li.dragged").removeClass("dragged")})}else _what=what;if(is_new){if(!this.settings.callback.beforecreate.call(null,this.get_node(what).get(0),this.get_node(where).get(0),how,this))return false}else{if(!this.settings.callback.beforemove.call(null,this.get_node(what).get(0),this.get_node(where).get(0),how,this))return false}if(!is_new){var tmp=what.parents(".tree:eq(0)");if(tmp.get(0)!=this.container.get(0)){tmp=tree_component.inst[tmp.attr("id")];if(tmp.settings.languages.length){var res=[];if(this.settings.languages.length==0)res.push("."+tmp.current_lang);else{for(var i in this.settings.languages){if(typeof this.settings.languages[i]=="function")continue;for(var j in tmp.settings.languages){if(typeof tmp.settings.languages[j]=="function")continue;if(this.settings.languages[i]==tmp.settings.languages[j])res.push("."+this.settings.languages[i])}}}if(res.length==0)return this.error("MOVE: NO COMMON LANGUAGES");what.find("a").not(res.join(",")).remove()}what.find("a.clicked").removeClass("clicked ui-state-active")}}what=_what;switch(how){case"before":$where.parents("ul:eq(0)").children("li.last").removeClass("last");$where.parent().before(what.removeClass("last"));$where.parents("ul:eq(0)").children("li:last").addClass("last");break;case"after":$where.parents("ul:eq(0)").children("li.last").removeClass("last");$where.parent().after(what.removeClass("last"));$where.parents("ul:eq(0)").children("li:last").addClass("last");break;case"inside":if($where.parent().children("ul:first").size()){if(this.settings.rules.createat=="top")$where.parent().children("ul:first").prepend(what.removeClass("last")).children("li:last").addClass("last");else $where.parent().children("ul:first").children(".last").removeClass("last").end().append(what.removeClass("last")).children("li:last").addClass("last")}else{what.addClass("last");$where.parent().append("
              ").removeClass("leaf").addClass("closed");$where.parent().children("ul:first").prepend(what)}if($where.parent().hasClass("closed")){this.open_branch($where)}break;default:break}if($parent.find("li").size()==0){var $li=$parent.parent();$li.removeClass("open").removeClass("closed").addClass("leaf");if(!$li.is(".tree"))$li.children("ul").remove();$li.parents("ul:eq(0)").children("li.last").removeClass("last").end().children("li:last").addClass("last");this.set_cookie("open")}else{$parent.children("li.last").removeClass("last");$parent.children("li:last").addClass("last")}if(is_copy)this.settings.callback.oncopy.call(null,this.get_node(what).get(0),this.get_node(where).get(0),how,this,rb);else if(is_new)this.settings.callback.oncreate.call(null,this.get_node(what).get(0),($where.is("ul")?-1:this.get_node(where).get(0)),how,this,rb);else this.settings.callback.onmove.call(null,this.get_node(what).get(0),this.get_node(where).get(0),how,this,rb);return what},error:function(code){this.settings.callback.error.call(null,code,this);return false},lock:function(state){this.locked=state;if(this.locked)this.container.children("ul:eq(0)").addClass("locked");else this.container.children("ul:eq(0)").removeClass("locked")},cut:function(obj){if(this.locked)return this.error("LOCKED");obj=obj?this.get_node(obj):this.container.find("a.clicked").filter(":first-child").parent();if(!obj||!obj.size())return this.error("CUT: NO NODE SELECTED");this.copy_nodes=false;this.cut_nodes=obj},copy:function(obj){if(this.locked)return this.error("LOCKED");obj=obj?this.get_node(obj):this.container.find("a.clicked").filter(":first-child").parent();if(!obj||!obj.size())return this.error("COPY: NO NODE SELECTED");this.copy_nodes=obj;this.cut_nodes=false},paste:function(obj,position){if(this.locked)return this.error("LOCKED");var root=false;if(obj==-1){root=true;obj=this.container}else obj=obj?this.get_node(obj):this.selected;if(!root&&(!obj||!obj.size()))return this.error("PASTE: NO NODE SELECTED");if(!this.copy_nodes&&!this.cut_nodes)return this.error("PASTE: NOTHING TO DO");var _this=this;var pos=position;if(position=="before"){position=obj.parent().children().index(obj);obj=obj.parents("li:eq(0)")}else if(position=="after"){position=obj.parent().children().index(obj)+1;obj=obj.parents("li:eq(0)")}else if((typeof position).toLowerCase()=="undefined"||position=="inside"){position=(this.settings.rules.createat=="top")?0:obj.children("ul:eq(0)").children("li").size()}if(!root&&obj.size()==0){root=true;obj=this.container}if(this.copy_nodes&&this.copy_nodes.size()){var ok=true;if(!ok)return this.error("Invalid paste");if(!root&&!this.checkMove(this.copy_nodes,obj.children("a:eq(0)"),"inside"))return false;if(obj.children("ul").size()==0||(root==true&&obj.children("ul").children("li").size()==0)){if(!root)var a=this.moved(this.copy_nodes,obj.children("a:eq(0)"),"inside",false,true);else var a=this.moved(this.copy_nodes,this.container.children("ul:eq(0)"),"inside",false,true)}else if(pos=="before"&&obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").size())var a=this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").children("a:eq(0)"),"before",false,true);else if(pos=="after"&&obj.children("ul:eq(0)").children("li:nth-child("+(position)+")").size())var a=this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:nth-child("+(position)+")").children("a:eq(0)"),"after",false,true);else if(obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").size())var a=this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").children("a:eq(0)"),"before",false,true);else var a=this.moved(this.copy_nodes,obj.children("ul:eq(0)").children("li:last").children("a:eq(0)"),"after",false,true);this.copy_nodes=false}if(this.cut_nodes&&this.cut_nodes.size()){var ok=true;obj.parents().andSelf().each(function(){if(_this.cut_nodes.index(this)!=-1){ok=false;return false}});if(!ok)return this.error("Invalid paste");if(!root&&!this.checkMove(this.cut_nodes,obj.children("a:eq(0)"),"inside"))return false;if(obj.children("ul").size()==0||(root==true&&obj.children("ul").children("li").size()==0)){if(!root)var a=this.moved(this.cut_nodes,obj.children("a:eq(0)"),"inside");else var a=this.moved(this.cut_nodes,this.container.children("ul:eq(0)"),"inside")}else if(pos=="before"&&obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").size())var a=this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").children("a:eq(0)"),"before");else if(pos=="after"&&obj.children("ul:eq(0)").children("li:nth-child("+(position)+")").size())var a=this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:nth-child("+(position)+")").children("a:eq(0)"),"after");else if(obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").size())var a=this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:nth-child("+(position+1)+")").children("a:eq(0)"),"before");else var a=this.moved(this.cut_nodes,obj.children("ul:eq(0)").children("li:last").children("a:eq(0)"),"after");this.cut_nodes=false}},search:function(str){var _this=this;if(!str||(this.srch&&str!=this.srch)){this.srch="";this.srch_opn=false;this.container.find("a.search").removeClass("search ui-state-highlight")}this.srch=str;if(!str)return;if(this.settings.data.async){if(!this.srch_opn){var dd=$.extend({"search":str},this.settings.data.async_data(false,this));$.ajax({type:this.settings.data.method,url:this.settings.data.url,data:dd,dataType:"text",success:function(data){_this.srch_opn=$.unique(data.split(","));_this.search.apply(_this,[str])}})}else if(this.srch_opn.length){if(this.srch_opn&&this.srch_opn.length){var opn=false;for(var j=0;j0){opn=true;var tmp="#"+this.srch_opn[j];delete this.srch_opn[j];this.open_branch(tmp,true,function(){_this.search.apply(_this,[str])})}}if(!opn){this.srch_opn=[];_this.search.apply(_this,[str])}}}else{var selector="a";if(this.settings.languages.length)selector+="."+this.current_lang;this.container.find(selector+":contains('"+str+"')").addClass(this.settings.ui.theme_name=="themeroller"?"search ui-state-highlight":"search");this.srch_opn=false}}else{var selector="a";if(this.settings.languages.length)selector+="."+this.current_lang;this.container.find(selector+":contains('"+str+"')").addClass(this.settings.ui.theme_name=="themeroller"?"search ui-state-highlight":"search").parents("li.closed").each(function(){_this.open_branch(this,true)})}},destroy:function(){this.hide_context();this.container.unbind(".jstree");$("#"+this.container.attr("id")).die("click.jstree").die("dblclick.jstree").die("contextmenu.jstree").die("mouseover.jstree").die("mouseout.jstree").die("mousedown.jstree");this.container.removeClass("tree ui-widget ui-widget-content tree-default tree-"+this.settings.ui.theme_name).children("ul").removeClass("no_dots rtl ltr locked").find("li").removeClass("leaf").removeClass("open").removeClass("closed").removeClass("last").children("a").removeClass("clicked hover search ui-state-active ui-state-hover ui-state-highlight ui-state-default");if(this.cntr==tree_component.focused){for(var i in tree_component.inst){if(i!=this.cntr&&i!=this.container.attr("id")){tree_component.inst[i].focus();break}}}tree_component.inst[this.cntr]=false;tree_component.inst[this.container.attr("id")]=false;delete tree_component.inst[this.cntr];delete tree_component.inst[this.container.attr("id")];tree_component.cntr--}}}})(jQuery); diff --git a/umbraco/presentation/umbraco_client/modal/modal.js b/umbraco/presentation/umbraco_client/modal/modal.js index c4f2650b6d..05ce597712 100644 --- a/umbraco/presentation/umbraco_client/modal/modal.js +++ b/umbraco/presentation/umbraco_client/modal/modal.js @@ -1,66 +1,176 @@ -// HELPERS -function openModal(url, name, height, width) { - var dialog = jQuery('#umbModalBox').jqm({ - onShow: function(h) { - var umbModal = jQuery(h.w); - var umbModalContent = jQuery("iframe", umbModal); +/// - umbModalContent.width(width); - umbModalContent.height(height - 30); +Umbraco.Sys.registerNamespace("Umbraco.Controls"); - jQuery("#umbModalBoxHeader").html(name); +(function($) { - if (height > 0) umbModal.height(height); + $.fn.ModalWindowAPI = function() { + /// jQuery plugin exposes the modal window api for the selected object + //if there's more than item in the selector, throw exception + if ($(this).length != 1) { + throw "ModalWindowAPI selector requires that there be exactly one control selected"; + }; + return $(this).data("ModalWindowAPI") == null ? null : $(this).data("ModalWindowAPI"); + }; - if (width > 0) { - umbModal.width(width); - umbModal.css("left", ((jQuery(document).width() - width) / 2) + "px"); - } + Umbraco.Controls.ModalWindow = function() { + /// Modal window class, when open is called, it will create a temporary html element to attach the window to + return { + _wId: Umbraco.Utils.generateRandom().toString().replace(".", ""), //the modal window ID that will be assigned + _obj: null, //the jquery element for the modal window + _rVal: null, //a return value specified when closing that gets passed to the onCloseCallback method + open: function(url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback) { + /// Opens a modal window + /// Optional + /// Optional + /// + /// Optional: An array of jQuery selectors that will trigger the modal window to close + /// + /// + /// A method that is called when the window is closing. the callback method will receive an instance + /// of the jQuery object for the popup window/iframe so that you can query against the contents of the window + /// to extract any information. + /// The callback will receive one parameter with 2 properties: + /// modalContent = the jQuery object for the popup window to query against + /// outVal = the value passed to the close window method that was used to close the window (if it was specified) + /// The generated jquery object bound to the modal window - umbModalContent.html('').attr('src', createUniqueUrl(url)); - - h.w.show(); - umbModalContent.show(); - - jQuery(document).keyup(function(event) { - if (event.keyCode == 27 && umbModal.css("display") == "block") { - closeModal(); + //check if the modal elems exist + if (!this._modalElemsExist()) { + this._createModalElems(); } - }); - }, - onHide: function(h) { - var umbModal = jQuery(h.w); - var umbModalContent = jQuery("iframe", umbModal); - h.w.hide(); - h.o.remove(); - umbModalContent.hide(); - umbModalContent.html('').attr('src', ''); - } - }).jqmShow(); -} + var _this = this; -function createUniqueUrl(url) { - var z = new Date().getTime(); - var rnd = (z - (parseInt(z / 1000, 10) * 1000)) / 10 + this._obj.jqm({ - if (url.indexOf("?") > -1) - return url += "&rndo=" + rnd; - else - return url += "?rndo=" + rnd; -} + onShow: function(h) { + var umbModal = $(h.w); + var umbModalContent = $("iframe", umbModal); + umbModalContent.width(width); + umbModalContent.height(showHeader ? height - 30 : height); -function closeModal() { - top.focus(); - $('#umbModalBox').jqmHide(); + //remove the header if it shouldn't be shown + if (!showHeader) { + _this._obj.find(".umbModalBoxHeader").remove(); + _this._obj.find(".umbracModalBoxClose").remove(); + } + else { + //set the title + _this._obj.find(".umbModalBoxHeader").html(name); + } - return false; -} + //if the height is set, then set it + if (height > 0) { + umbModal.height(height); + } + //if the width is set, then set it in the center + if (width > 0) { + umbModal.width(width); + umbModal.css("left", (($(document).width() - width) / 2) + "px"); + } + //if the top is set + if (top > 0) { + umbModal.css("top", top + "px"); + } + //if the leftOffset is set + if (leftOffset > 0) { + var newLeft = parseInt(umbModal.css("left").replace("px", "")) + leftOffset; + umbModal.css("left", newLeft); + } -function fitModalToPageSize(modalHeight, width) { + umbModalContent.html('').attr('src', _this._getUniqueUrl(url)); -} + umbModal.show(); + umbModalContent.show(); + + $(document).keyup(function(event) { + if (event.keyCode == 27 && umbModal.css("display") == "block") { + _this.close(); + } + }); + if (closeTriggers) { + for (var x in closeTriggers) { + _this._obj.jqmAddClose(closeTriggers[x]); + } + } + + }, + onHide: function(h) { + var umbModal = $(h.w); + var umbModalContent = $("iframe", umbModal); + if (typeof onCloseCallback == "function") { + //call the callback if specified, pass the jquery content object as a param and the output value array + var e = { modalContent: umbModalContent, outVal: _this._rVal }; + onCloseCallback.call(_this, e); + } + h.w.hide(); + h.o.remove(); + umbModalContent.hide(); + umbModalContent.html('').attr('src', ''); + _this.close(); + } + }); + + this._obj.jqmShow(); + //store the api in this objects data store + this._obj.data("ModalWindowAPI", this); + return this._obj; + }, + close: function(rVal) { + /// Closes the modal window, Removes the object from the DOM + /// if specified, will add this parameter to the onCloseCallback method's outVal parameter so it may be used in the closing callback method + this._rVal = rVal; + top.focus(); + this._obj.jqmHide(); + this._obj.remove(); + return false; + }, + _createModalElems: function() { + /// This will create the html elements required for the modal overlay if they do not already exist in the DOM + + var overlayHtml = "
              " + + "
              ×" + + "
              " + + "
              "; + + this._obj = $(overlayHtml).appendTo("body"); + + var _this = this; + if ($.fn.draggable) this._obj.draggable({ + cursor: 'move', + distance: 5, + iframeFix: true, + helper: function(event) { + var o = $(this).clone(); + o.children().remove(); + o.css("border-width", "1px"); + return o; + }, + start: function(event, ui) { + ui.helper.css("z-index", 20000); + }, + stop: function(event, ui) { + _this._obj.css("top", ui.absolutePosition.top); + _this._obj.css("left", ui.absolutePosition.left); + } + }); + }, + _modalElemsExist: function() { + return ($("#" + this._wId + "_modal").length > 0); + }, + _getUniqueUrl: function(url) { + var r = Umbraco.Utils.generateRandom(); + if (url.indexOf("?") > -1) + return url += "&rndo=" + r; + else + return url += "?rndo=" + r; + } + }; + }; + +})(jQuery); // @@ -105,7 +215,7 @@ function fitModalToPageSize(modalHeight, width) { $.jqm = { hash: {}, open: function(s, t) { - var h = H[s], c = h.c, cc = '.' + c.closeClass, z = (parseInt(h.w.css('z-index'))), z = (z > 0) ? z : 3000, o = $('
              ').css({ height: '100%', width: '100%', position: 'fixed', left: 0, top: 0, 'z-index': z - 1}); if (h.a) return F; h.t = t; h.a = true; h.w.css('z-index', z); + var h = H[s], c = h.c, cc = '.' + c.closeClass, z = (parseInt(h.w.css('z-index'))), z = (z > 0) ? z : 3000, o = $('
              ').css({ height: '100%', width: '100%', position: 'fixed', left: 0, top: 0, 'z-index': z - 1 }); if (h.a) return F; h.t = t; h.a = true; h.w.css('z-index', z); if (c.modal) { if (!A[0]) L('bind'); A.push(s); } else if (c.overlay > 0) h.w.jqmAddClose(o); else o = F; @@ -132,8 +242,8 @@ function fitModalToPageSize(modalHeight, width) { }; var s = 0, H = $.jqm.hash, A = [], ie6 = $.browser.msie && ($.browser.version == "6.0"), F = false, i = $('').css({ opacity: 0 }), -e = function(h) { if (ie6) if (h.o) h.o.html('

              ').prepend(i); else if (!$('iframe.jqm', h.w)[0]) h.w.prepend(i);}, -//f = function(h) { try { $(':input:visible', h.w)[0].focus(); } catch (_) { } }, +e = function(h) { if (ie6) if (h.o) h.o.html('

              ').prepend(i); else if (!$('iframe.jqm', h.w)[0]) h.w.prepend(i); }, + //f = function(h) { try { $(':input:visible', h.w)[0].focus(); } catch (_) { } }, L = function(t) { $()[t]("keypress", m)[t]("keydown", m)[t]("mousedown", m); }, m = function(e) { var h = H[A[A.length - 1]], r = (!$(e.target).parents('.jqmID' + h.s)[0]); if (r) f(h); return !r; }, hs = function(w, t, c) { diff --git a/umbraco/presentation/umbraco_client/modal/style.css b/umbraco/presentation/umbraco_client/modal/style.css index 9c93bbe9c7..465a2556cf 100644 --- a/umbraco/presentation/umbraco_client/modal/style.css +++ b/umbraco/presentation/umbraco_client/modal/style.css @@ -1,8 +1,11 @@ -#umbModalBox { +/* TODO: Change these to classes to support many modal boxes */ + +#umbModalBox, +.umbModalBox { position: absolute; top: 0; border: 5px #a3a3a3 solid; - border-top: none; + /*border-top: none;*/ text-align: left; z-index: 10000; display: none; @@ -10,11 +13,16 @@ font: bold 100% "Lucida Grande", Arial, sans-serif; } -#umbModalBox.loaded{background-image: none;} +#umbModalBox.loaded, +.umbModalBox.loaded +{ + background-image: none; +} .jqmOverlay {background: url(modalBackground.gif)} -#umbModalBoxHeader { +#umbModalBoxHeader, +.umbModalBoxHeader { margin: 0; text-shadow: #FFF 0 1px 0; padding: .5em 2em .5em .75em; @@ -22,13 +30,15 @@ text-align: left; } -#umbModalBoxContent { +#umbModalBoxContent, +.umbModalBoxContent { padding: 0px; overflow: hidden; height: 100%; } -#umbracModalBoxClose { +#umbracModalBoxClose, +.umbracModalBoxClose { display: block; position: absolute; right: 5px; top: 2px; @@ -38,13 +48,19 @@ font-size: 13px; } -#umbModalBoxContent {border-top: 1px solid #F9F9F9; } +#umbModalBoxContent, +.umbModalBoxContent {border-top: 1px solid #F9F9F9; } -#umbModalBoxHeader { +#umbModalBoxHeader, +.umbModalBoxHeader { background: url(modalGradiant.gif) repeat-x bottom #fff; border-bottom: 1px solid #CCC; - color: #378080 + color: #378080; + cursor:move; } -#umbracModalBoxClose { color: #777 } -#umbracModalBoxClose:hover { color: #000 } \ No newline at end of file +#umbracModalBoxClose, +.umbracModalBoxClose { color: #777 } + +#umbracModalBoxClose:hover, +.umbracModalBoxClose:hover { color: #000 } \ No newline at end of file diff --git a/umbraco/presentation/umbraco_client/ui/default.css b/umbraco/presentation/umbraco_client/ui/default.css index 9d29055ea6..3a012ab093 100644 --- a/umbraco/presentation/umbraco_client/ui/default.css +++ b/umbraco/presentation/umbraco_client/ui/default.css @@ -550,10 +550,16 @@ guiEditor { .success a {color:#264409;} -.sprTree { - background-color: #fff; - background-image: url(../../umbraco/images/umbraco/sprites.png); - display: inline; - padding-bottom: 2px; -} -.sprTree img{width: 16px; height: 18px; padding-right: 7px;} \ No newline at end of file +.sprTree { + /*background-color: #fff;*/ + background-image: url(../../umbraco/images/umbraco/sprites.png); + display: inline; + padding-bottom: 2px; +} +.sprTree img{width: 16px; height: 18px; padding-right: 7px;} + +.treeContainer +{ + padding:5px; + background-color:White; +} \ No newline at end of file diff --git a/umbraco/presentation/web.config.BOMBER.xslt b/umbraco/presentation/web.config.BOMBER.xslt deleted file mode 100644 index ac97e696f3..0000000000 --- a/umbraco/presentation/web.config.BOMBER.xslt +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - server=.\sqlexpress;database=umbraco4.1;Integrated Security=true - - - - - - - - - - - - - - diff --git a/umbraco/presentation/web.config.SHANDEMVAIO.xslt b/umbraco/presentation/web.config.SHANDEMVAIO.xslt index 622a45798b..27c5fed580 100644 --- a/umbraco/presentation/web.config.SHANDEMVAIO.xslt +++ b/umbraco/presentation/web.config.SHANDEMVAIO.xslt @@ -4,12 +4,13 @@ - datalayer="VistaDB,VistaDB For Umbraco" + server=.\sqlexpress;database=UmbracoTest;user id=sa;password=test + - 4.1.0.alpha + 4.1.0.beta - + @@ -20,5 +21,5 @@ - + diff --git a/umbraco/presentation/web.config.SHOCKING.xslt b/umbraco/presentation/web.config.SHOCKING.xslt index 5715898ec6..d1a14ecfa7 100644 --- a/umbraco/presentation/web.config.SHOCKING.xslt +++ b/umbraco/presentation/web.config.SHOCKING.xslt @@ -4,11 +4,17 @@ - datalayer="VistaDB,VistaDB For Umbraco" + server=SHOCKING\SQLEXPRESS;database=UmbracoTest2;user id=sa;password=test 4.1.0.beta + + /App_Data/umbraco.config + + + /umbraco + diff --git a/umbraco/umbraco.Legacy/umbraco.Legacy.csproj b/umbraco/umbraco.Legacy/umbraco.Legacy.csproj index 2c58256343..e68b966caf 100644 --- a/umbraco/umbraco.Legacy/umbraco.Legacy.csproj +++ b/umbraco/umbraco.Legacy/umbraco.Legacy.csproj @@ -325,6 +325,10 @@ + + + + diff --git a/umbraco/presentation/umbraco/js/submodal/common.js b/umbraco/umbraco.Legacy/umbraco/js/submodal/common.js similarity index 100% rename from umbraco/presentation/umbraco/js/submodal/common.js rename to umbraco/umbraco.Legacy/umbraco/js/submodal/common.js diff --git a/umbraco/presentation/umbraco/js/submodal/maskBG.png b/umbraco/umbraco.Legacy/umbraco/js/submodal/maskBG.png similarity index 100% rename from umbraco/presentation/umbraco/js/submodal/maskBG.png rename to umbraco/umbraco.Legacy/umbraco/js/submodal/maskBG.png diff --git a/umbraco/presentation/umbraco/js/submodal/subModal.css b/umbraco/umbraco.Legacy/umbraco/js/submodal/subModal.css similarity index 100% rename from umbraco/presentation/umbraco/js/submodal/subModal.css rename to umbraco/umbraco.Legacy/umbraco/js/submodal/subModal.css diff --git a/umbraco/presentation/umbraco/js/submodal/subModal.js b/umbraco/umbraco.Legacy/umbraco/js/submodal/subModal.js similarity index 100% rename from umbraco/presentation/umbraco/js/submodal/subModal.js rename to umbraco/umbraco.Legacy/umbraco/js/submodal/subModal.js