diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index eab5f9a350..94e93c9556 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -740,7 +740,7 @@ - + diff --git a/src/Umbraco.Web.UI/Web.config b/src/Umbraco.Web.UI/Web.config new file mode 100644 index 0000000000..4a07691103 --- /dev/null +++ b/src/Umbraco.Web.UI/Web.config @@ -0,0 +1,239 @@ + + + +
+
+ +
+ +
+
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx index 2c11e6b2a6..4e96930591 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx @@ -55,10 +55,17 @@ function xsltVisualize() { - xsltSnippet = UmbEditor.GetSelection(); - if (xsltSnippet == '') - UmbEditor.GetCode() - + xsltSnippet = UmbEditor.IsSimpleEditor + ? jQuery("#<%= editorSource.ClientID %>").getSelection().text + : UmbEditor._editor.selection(); + + if (xsltSnippet == '') { + xsltSnippet = UmbEditor.IsSimpleEditor + ? jQuery("#<%= editorSource.ClientID %>").val() + : UmbEditor.GetCode(); + // alert('Please select the xslt to visualize'); + } + UmbClientMgr.openModalWindow('<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650); } diff --git a/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/editor_plugin_src.js b/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/editor_plugin_src.js index 2404fd4362..3ec4f6a2d2 100644 --- a/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/editor_plugin_src.js +++ b/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/editor_plugin_src.js @@ -39,7 +39,7 @@ ed.addButton('umbracoembed', { title : 'Embed third party media', cmd : 'mceUmbracoEmbed', - image : url + '/img/embed.png' + image : url + '/img/embed.gif' }); // Add a node change handler, selects the button in the UI when a image is selected diff --git a/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/img/embed.gif b/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/img/embed.gif new file mode 100644 index 0000000000..76216085d3 Binary files /dev/null and b/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracoembed/img/embed.gif differ