From 580b670f33252c0c8ae71721819b944e4e3a4192 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Wed, 19 Jan 2011 08:27:00 -0100 Subject: [PATCH 1/5] Fixes: RTE can't cleanup pasted code automatically(umbraco 4.6.1) Work Items: 29897 --- .../plugins/paste/editor_plugin_src.js | 1462 ++++++++--------- 1 file changed, 731 insertions(+), 731 deletions(-) diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js index c69ec3f8d3..1a82ca644f 100644 --- a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js +++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js @@ -8,761 +8,761 @@ * Contributing: http://tinymce.moxiecode.com/contributing */ -(function() { - var each = tinymce.each, +(function () { + var each = tinymce.each, entities = null, defs = { - paste_auto_cleanup_on_paste : true, - paste_block_drop : false, - paste_retain_style_properties : "none", - paste_strip_class_attributes : "mso", - paste_remove_spans : false, - paste_remove_styles : false, - paste_remove_styles_if_webkit : true, - paste_convert_middot_lists : true, - paste_convert_headers_to_strong : false, - paste_dialog_width : "450", - paste_dialog_height : "400", - paste_text_use_dialog : false, - paste_text_sticky : false, - paste_text_notifyalways : false, - paste_text_linebreaktype : "p", - paste_text_replacements : [ + paste_auto_cleanup_on_paste: true, + paste_block_drop: false, + paste_retain_style_properties: "none", + paste_strip_class_attributes: "mso", + paste_remove_spans: false, + paste_remove_styles: false, + paste_remove_styles_if_webkit: true, + paste_convert_middot_lists: true, + paste_convert_headers_to_strong: false, + paste_dialog_width: "450", + paste_dialog_height: "400", + paste_text_use_dialog: false, + paste_text_sticky: false, + paste_text_notifyalways: false, + paste_text_linebreaktype: "p", + paste_text_replacements: [ [/\u2026/g, "..."], [/[\x93\x94\u201c\u201d]/g, '"'], [/[\x60\x91\x92\u2018\u2019]/g, "'"] ] }; - function getParam(ed, name) { - return ed.getParam(name, defs[name]); - } + function getParam(ed, name) { + return ed.getParam(name, defs[name]); + } - tinymce.create('tinymce.plugins.PastePlugin', { - init : function(ed, url) { - var t = this; + tinymce.create('tinymce.plugins.PastePlugin', { + init: function (ed, url) { + var t = this; - t.editor = ed; - t.url = url; + t.editor = ed; + t.url = url; - // Setup plugin events - t.onPreProcess = new tinymce.util.Dispatcher(t); - t.onPostProcess = new tinymce.util.Dispatcher(t); + // Setup plugin events + t.onPreProcess = new tinymce.util.Dispatcher(t); + t.onPostProcess = new tinymce.util.Dispatcher(t); - // Register default handlers - t.onPreProcess.add(t._preProcess); - t.onPostProcess.add(t._postProcess); + // Register default handlers + t.onPreProcess.add(t._preProcess); + t.onPostProcess.add(t._postProcess); - // Register optional preprocess handler - t.onPreProcess.add(function(pl, o) { - ed.execCallback('paste_preprocess', pl, o); - }); + // Register optional preprocess handler + t.onPreProcess.add(function (pl, o) { + ed.execCallback('paste_preprocess', pl, o); + }); - // Register optional postprocess - t.onPostProcess.add(function(pl, o) { - ed.execCallback('paste_postprocess', pl, o); - }); + // Register optional postprocess + t.onPostProcess.add(function (pl, o) { + ed.execCallback('paste_postprocess', pl, o); + }); - // Initialize plain text flag - ed.pasteAsPlainText = false; + // Initialize plain text flag + ed.pasteAsPlainText = false; - // This function executes the process handlers and inserts the contents - // force_rich overrides plain text mode set by user, important for pasting with execCommand - function process(o, force_rich) { - var dom = ed.dom; + // This function executes the process handlers and inserts the contents + // force_rich overrides plain text mode set by user, important for pasting with execCommand + function process(o, force_rich) { + var dom = ed.dom; - // Execute pre process handlers - t.onPreProcess.dispatch(t, o); + // Execute pre process handlers + t.onPreProcess.dispatch(t, o); - // Create DOM structure - o.node = dom.create('div', 0, o.content); + // Create DOM structure + o.node = dom.create('div', 0, o.content); - // Execute post process handlers - t.onPostProcess.dispatch(t, o); + // Execute post process handlers + t.onPostProcess.dispatch(t, o); - // Serialize content - o.content = ed.serializer.serialize(o.node, {getInner : 1}); + // Serialize content + o.content = ed.serializer.serialize(o.node, { getInner: 1 }); - // Plain text option active? - if ((!force_rich) && (ed.pasteAsPlainText)) { - t._insertPlainText(ed, dom, o.content); + // Plain text option active? + if ((!force_rich) && (ed.pasteAsPlainText)) { + t._insertPlainText(ed, dom, o.content); - if (!getParam(ed, "paste_text_sticky")) { - ed.pasteAsPlainText = false; - ed.controlManager.setActive("pastetext", false); - } - } else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) { - // Handle insertion of contents containing block elements separately - t._insertBlockContent(ed, dom, o.content); - } else { - t._insert(o.content); - } - } + if (!getParam(ed, "paste_text_sticky")) { + ed.pasteAsPlainText = false; + ed.controlManager.setActive("pastetext", false); + } + } else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) { + // Handle insertion of contents containing block elements separately + t._insertBlockContent(ed, dom, o.content); + } else { + t._insert(o.content); + } + } - // Add command for external usage - ed.addCommand('mceInsertClipboardContent', function(u, o) { - process(o, true); - }); + // Add command for external usage + ed.addCommand('mceInsertClipboardContent', function (u, o) { + process(o, true); + }); - if (!getParam(ed, "paste_text_use_dialog")) { - ed.addCommand('mcePasteText', function(u, v) { - var cookie = tinymce.util.Cookie; + if (!getParam(ed, "paste_text_use_dialog")) { + ed.addCommand('mcePasteText', function (u, v) { + var cookie = tinymce.util.Cookie; - ed.pasteAsPlainText = !ed.pasteAsPlainText; - ed.controlManager.setActive('pastetext', ed.pasteAsPlainText); + ed.pasteAsPlainText = !ed.pasteAsPlainText; + ed.controlManager.setActive('pastetext', ed.pasteAsPlainText); - if ((ed.pasteAsPlainText) && (!cookie.get("tinymcePasteText"))) { - if (getParam(ed, "paste_text_sticky")) { - ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky')); - } else { - ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky')); - } + if ((ed.pasteAsPlainText) && (!cookie.get("tinymcePasteText"))) { + if (getParam(ed, "paste_text_sticky")) { + ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky')); + } else { + ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky')); + } - if (!getParam(ed, "paste_text_notifyalways")) { - cookie.set("tinymcePasteText", "1", new Date(new Date().getFullYear() + 1, 12, 31)) - } - } - }); - } + if (!getParam(ed, "paste_text_notifyalways")) { + cookie.set("tinymcePasteText", "1", new Date(new Date().getFullYear() + 1, 12, 31)) + } + } + }); + } - ed.addButton('pastetext', {title: 'paste.paste_text_desc', cmd: 'mcePasteText'}); - ed.addButton('selectall', {title: 'paste.selectall_desc', cmd: 'selectall'}); + ed.addButton('pastetext', { title: 'paste.paste_text_desc', cmd: 'mcePasteText' }); + ed.addButton('selectall', { title: 'paste.selectall_desc', cmd: 'selectall' }); - // This function grabs the contents from the clipboard by adding a - // hidden div and placing the caret inside it and after the browser paste - // is done it grabs that contents and processes that - function grabContent(e) { - var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY; + // This function grabs the contents from the clipboard by adding a + // hidden div and placing the caret inside it and after the browser paste + // is done it grabs that contents and processes that + function grabContent(e) { + var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY; - // Check if browser supports direct plaintext access - if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) { - e.preventDefault(); - process({content : (e.clipboardData || dom.doc.dataTransfer).getData('Text').replace(/\r?\n/g, '
')}); - return; - } + // Check if browser supports direct plaintext access + if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) { + e.preventDefault(); + process({ content: (e.clipboardData || dom.doc.dataTransfer).getData('Text').replace(/\r?\n/g, '
') }); + return; + } - if (dom.get('_mcePaste')) - return; + if (dom.get('_mcePaste')) + return; - // Create container to paste into - n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste'}, '\uFEFF
'); + // Create container to paste into + n = dom.add(body, 'div', { id: '_mcePaste', 'class': 'mcePaste' }, '\uFEFF
'); - // If contentEditable mode we need to find out the position of the closest element - if (body != ed.getDoc().body) - posY = dom.getPos(ed.selection.getStart(), body).y; - else - posY = body.scrollTop; + // If contentEditable mode we need to find out the position of the closest element + if (body != ed.getDoc().body) + posY = dom.getPos(ed.selection.getStart(), body).y; + else + posY = body.scrollTop; - // Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles - dom.setStyles(n, { - position : 'absolute', - left : -10000, - top : posY, - width : 1, - height : 1, - overflow : 'hidden' - }); + // Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles + dom.setStyles(n, { + position: 'absolute', + left: -10000, + top: posY, + width: 1, + height: 1, + overflow: 'hidden' + }); - if (tinymce.isIE) { - // Select the container - rng = dom.doc.body.createTextRange(); - rng.moveToElementText(n); - rng.execCommand('Paste'); + if (tinymce.isIE) { + // Select the container + rng = dom.doc.body.createTextRange(); + rng.moveToElementText(n); + rng.execCommand('Paste'); - // Remove container - dom.remove(n); + // Remove container + dom.remove(n); - // Check if the contents was changed, if it wasn't then clipboard extraction failed probably due - // to IE security settings so we pass the junk though better than nothing right - if (n.innerHTML === '\uFEFF') { - ed.execCommand('mcePasteWord'); - e.preventDefault(); - return; - } + // Check if the contents was changed, if it wasn't then clipboard extraction failed probably due + // to IE security settings so we pass the junk though better than nothing right + if (n.innerHTML === '\uFEFF') { + ed.execCommand('mcePasteWord'); + e.preventDefault(); + return; + } - // Process contents - process({content : n.innerHTML}); + // Process contents + process({ content: n.innerHTML }); - // Block the real paste event - return tinymce.dom.Event.cancel(e); - } else { - function block(e) { - e.preventDefault(); - }; + // Block the real paste event + return tinymce.dom.Event.cancel(e); + } else { + function block(e) { + e.preventDefault(); + }; - // Block mousedown and click to prevent selection change - dom.bind(ed.getDoc(), 'mousedown', block); - dom.bind(ed.getDoc(), 'keydown', block); + // Block mousedown and click to prevent selection change + dom.bind(ed.getDoc(), 'mousedown', block); + dom.bind(ed.getDoc(), 'keydown', block); - or = ed.selection.getRng(); + or = ed.selection.getRng(); - // Move caret into hidden div - n = n.firstChild; - rng = ed.getDoc().createRange(); - rng.setStart(n, 0); - rng.setEnd(n, 1); - sel.setRng(rng); + // Move caret into hidden div + n = n.firstChild; + rng = ed.getDoc().createRange(); + rng.setStart(n, 0); + rng.setEnd(n, 1); + sel.setRng(rng); - // Wait a while and grab the pasted contents - window.setTimeout(function() { - var h = '', nl = dom.select('div.mcePaste'); + // Wait a while and grab the pasted contents + window.setTimeout(function () { + var h = '', nl = dom.select('div.mcePaste'); - // WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string - each(nl, function(n) { - var child = n.firstChild; + // WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string + each(nl, function (n) { + var child = n.firstChild; - // WebKit inserts a DIV container with lots of odd styles - if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) { - dom.remove(child, 1); - } + // WebKit inserts a DIV container with lots of odd styles + if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) { + dom.remove(child, 1); + } - // WebKit duplicates the divs so we need to remove them - each(dom.select('div.mcePaste', n), function(n) { - dom.remove(n, 1); - }); + // WebKit duplicates the divs so we need to remove them + each(dom.select('div.mcePaste', n), function (n) { + dom.remove(n, 1); + }); - // Remove apply style spans - each(dom.select('span.Apple-style-span', n), function(n) { - dom.remove(n, 1); - }); + // Remove apply style spans + each(dom.select('span.Apple-style-span', n), function (n) { + dom.remove(n, 1); + }); - // Remove bogus br elements - each(dom.select('br[_mce_bogus]', n), function(n) { - dom.remove(n); - }); + // Remove bogus br elements + each(dom.select('br[_mce_bogus]', n), function (n) { + dom.remove(n); + }); - h += n.innerHTML; - }); + h += n.innerHTML; + }); - // Remove the nodes - each(nl, function(n) { - dom.remove(n); - }); + // Remove the nodes + each(nl, function (n) { + dom.remove(n); + }); - // Restore the old selection - if (or) - sel.setRng(or); + // Restore the old selection + if (or) + sel.setRng(or); - process({content : h}); + process({ content: h }); - // Unblock events ones we got the contents - dom.unbind(ed.getDoc(), 'mousedown', block); - dom.unbind(ed.getDoc(), 'keydown', block); - }, 0); - } - } + // Unblock events ones we got the contents + dom.unbind(ed.getDoc(), 'mousedown', block); + dom.unbind(ed.getDoc(), 'keydown', block); + }, 0); + } + } - // Check if we should use the new auto process method - if (getParam(ed, "paste_auto_cleanup_on_paste")) { - // Is it's Opera or older FF use key handler - if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) { - ed.onKeyDown.add(function(ed, e) { - if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45)) - grabContent(e); - }); - } else { - // Grab contents on paste event on Gecko and WebKit - ed.onPaste.addToTop(function(ed, e) { - return grabContent(e); - }); - } - } + // Check if we should use the new auto process method + if (getParam(ed, "paste_auto_cleanup_on_paste")) { + // Is it's Opera or older FF use key handler + if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) { + ed.onKeyDown.add(function (ed, e) { + if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45)) + grabContent(e); + }); + } else { + // Grab contents on paste event on Gecko and WebKit + ed.onPaste.addToTop(function (ed, e) { + return grabContent(e); + }); + } + } - // Block all drag/drop events - if (getParam(ed, "paste_block_drop")) { - ed.onInit.add(function() { - ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) { - e.preventDefault(); - e.stopPropagation(); + // Block all drag/drop events + if (getParam(ed, "paste_block_drop")) { + ed.onInit.add(function () { + ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function (e) { + e.preventDefault(); + e.stopPropagation(); - return false; - }); - }); - } + return false; + }); + }); + } - // Add legacy support - t._legacySupport(); - }, + // Add legacy support + t._legacySupport(); + }, - getInfo : function() { - return { - longname : 'Paste text/word', - author : 'Moxiecode Systems AB', - authorurl : 'http://tinymce.moxiecode.com', - infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste', - version : tinymce.majorVersion + "." + tinymce.minorVersion - }; - }, + getInfo: function () { + return { + longname: 'Paste text/word', + author: 'Moxiecode Systems AB', + authorurl: 'http://tinymce.moxiecode.com', + infourl: 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste', + version: tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, - _preProcess : function(pl, o) { - //console.log('Before preprocess:' + o.content); + _preProcess: function (pl, o) { + //console.log('Before preprocess:' + o.content); - var ed = this.editor, + var ed = this.editor, h = o.content, grep = tinymce.grep, explode = tinymce.explode, trim = tinymce.trim, len, stripClass; - function process(items) { - each(items, function(v) { - // Remove or replace - if (v.constructor == RegExp) - h = h.replace(v, ''); - else - h = h.replace(v[0], v[1]); - }); + function process(items) { + each(items, function (v) { + // Remove or replace + if (v.constructor == RegExp) + h = h.replace(v, ''); + else + h = h.replace(v[0], v[1]); + }); - // UMBRACO SPECIFIC, remove all headers that's not in the style list + // UMBRACO SPECIFIC, remove all headers that's not in the style list + + var umbracoAllowedStyles = ed.getParam('theme_umbraco_styles'); + for (var i = 1; i < 7; i++) { + if (umbracoAllowedStyles.indexOf("h" + i) == -1) { + h = h.replace(new RegExp('', 'gi'), '

'); + h = h.replace(new RegExp('', 'gi'), '

'); + } + } - var umbracoAllowedStyles = this.editor.getParam('theme_umbraco_styles'); - for (var i = 1; i < 7; i++) { - if (umbracoAllowedStyles.indexOf("h" + i) == -1) { - h = h.replace(new RegExp('', 'gi'), '

'); - h = h.replace(new RegExp('', 'gi'), '

'); - } - } + } - } + // Detect Word content and process it more aggressive + if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) { + o.wordContent = true; // Mark the pasted contents as word specific content + //console.log('Word contents detected.'); - // Detect Word content and process it more aggressive - if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) { - o.wordContent = true; // Mark the pasted contents as word specific content - //console.log('Word contents detected.'); - - // Process away some basic content - process([ - /^\s*( )+/gi, //   entities at the start of contents + // Process away some basic content + process([ + /^\s*( )+/gi, //   entities at the start of contents /( |]*>)+\s*$/gi //   entities at the end of contents ]); - if (getParam(ed, "paste_convert_headers_to_strong")) { - h = h.replace(/

]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "

$1

"); - } + if (getParam(ed, "paste_convert_headers_to_strong")) { + h = h.replace(/

]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "

$1

"); + } - if (getParam(ed, "paste_convert_middot_lists")) { - process([ - [//gi, '$&__MCE_ITEM__'], // Convert supportLists to a list item marker + if (getParam(ed, "paste_convert_middot_lists")) { + process([ + [//gi, '$&__MCE_ITEM__'], // Convert supportLists to a list item marker [/(]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'] // Convert mso-list and symbol spans to item markers ]); - } + } - process([ - // Word comments like conditional comments etc + process([ + // Word comments like conditional comments etc //gi, - // Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags + // Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags /<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, - // Convert into for line-though + // Convert into for line-though [/<(\/?)s>/gi, "<$1strike>"], - // Replace nsbp entites to char since it's easier to handle + // Replace nsbp entites to char since it's easier to handle [/ /gi, "\u00a0"] ]); - // Remove bad attributes, with or without quotes, ensuring that attribute text is really inside a tag. - // If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot. - do { - len = h.length; - h = h.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1"); - } while (len != h.length); + // Remove bad attributes, with or without quotes, ensuring that attribute text is really inside a tag. + // If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot. + do { + len = h.length; + h = h.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1"); + } while (len != h.length); - // Remove all spans if no styles is to be retained - if (getParam(ed, "paste_retain_style_properties").replace(/^none$/i, "").length == 0) { - h = h.replace(/<\/?span[^>]*>/gi, ""); - } else { - // We're keeping styles, so at least clean them up. - // CSS Reference: http://msdn.microsoft.com/en-us/library/aa155477.aspx + // Remove all spans if no styles is to be retained + if (getParam(ed, "paste_retain_style_properties").replace(/^none$/i, "").length == 0) { + h = h.replace(/<\/?span[^>]*>/gi, ""); + } else { + // We're keeping styles, so at least clean them up. + // CSS Reference: http://msdn.microsoft.com/en-us/library/aa155477.aspx - process([ - // Convert ___ to string of alternating breaking/non-breaking spaces of same length + process([ + // Convert ___ to string of alternating breaking/non-breaking spaces of same length [/([\s\u00a0]*)<\/span>/gi, - function(str, spaces) { - return (spaces.length > 0)? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : ""; + function (str, spaces) { + return (spaces.length > 0) ? spaces.replace(/./, " ").slice(Math.floor(spaces.length / 2)).split("").join("\u00a0") : ""; } ], - // Examine all styles: delete junk, transform some, and keep the rest + // Examine all styles: delete junk, transform some, and keep the rest [/(<[a-z][^>]*)\sstyle="([^"]*)"/gi, - function(str, tag, style) { - var n = [], + function (str, tag, style) { + var n = [], i = 0, s = explode(trim(style).replace(/"/gi, "'"), ";"); - // Examine each style definition within the tag's style attribute - each(s, function(v) { - var name, value, + // Examine each style definition within the tag's style attribute + each(s, function (v) { + var name, value, parts = explode(v, ":"); - function ensureUnits(v) { - return v + ((v !== "0") && (/\d$/.test(v)))? "px" : ""; - } + function ensureUnits(v) { + return v + ((v !== "0") && (/\d$/.test(v))) ? "px" : ""; + } - if (parts.length == 2) { - name = parts[0].toLowerCase(); - value = parts[1].toLowerCase(); + if (parts.length == 2) { + name = parts[0].toLowerCase(); + value = parts[1].toLowerCase(); - // Translate certain MS Office styles into their CSS equivalents - switch (name) { - case "mso-padding-alt": - case "mso-padding-top-alt": - case "mso-padding-right-alt": - case "mso-padding-bottom-alt": - case "mso-padding-left-alt": - case "mso-margin-alt": - case "mso-margin-top-alt": - case "mso-margin-right-alt": - case "mso-margin-bottom-alt": - case "mso-margin-left-alt": - case "mso-table-layout-alt": - case "mso-height": - case "mso-width": - case "mso-vertical-align-alt": - n[i++] = name.replace(/^mso-|-alt$/g, "") + ":" + ensureUnits(value); - return; + // Translate certain MS Office styles into their CSS equivalents + switch (name) { + case "mso-padding-alt": + case "mso-padding-top-alt": + case "mso-padding-right-alt": + case "mso-padding-bottom-alt": + case "mso-padding-left-alt": + case "mso-margin-alt": + case "mso-margin-top-alt": + case "mso-margin-right-alt": + case "mso-margin-bottom-alt": + case "mso-margin-left-alt": + case "mso-table-layout-alt": + case "mso-height": + case "mso-width": + case "mso-vertical-align-alt": + n[i++] = name.replace(/^mso-|-alt$/g, "") + ":" + ensureUnits(value); + return; - case "horiz-align": - n[i++] = "text-align:" + value; - return; + case "horiz-align": + n[i++] = "text-align:" + value; + return; - case "vert-align": - n[i++] = "vertical-align:" + value; - return; + case "vert-align": + n[i++] = "vertical-align:" + value; + return; - case "font-color": - case "mso-foreground": - n[i++] = "color:" + value; - return; + case "font-color": + case "mso-foreground": + n[i++] = "color:" + value; + return; - case "mso-background": - case "mso-highlight": - n[i++] = "background:" + value; - return; + case "mso-background": + case "mso-highlight": + n[i++] = "background:" + value; + return; - case "mso-default-height": - n[i++] = "min-height:" + ensureUnits(value); - return; + case "mso-default-height": + n[i++] = "min-height:" + ensureUnits(value); + return; - case "mso-default-width": - n[i++] = "min-width:" + ensureUnits(value); - return; + case "mso-default-width": + n[i++] = "min-width:" + ensureUnits(value); + return; - case "mso-padding-between-alt": - n[i++] = "border-collapse:separate;border-spacing:" + ensureUnits(value); - return; + case "mso-padding-between-alt": + n[i++] = "border-collapse:separate;border-spacing:" + ensureUnits(value); + return; - case "text-line-through": - if ((value == "single") || (value == "double")) { - n[i++] = "text-decoration:line-through"; - } - return; + case "text-line-through": + if ((value == "single") || (value == "double")) { + n[i++] = "text-decoration:line-through"; + } + return; - case "mso-zero-height": - if (value == "yes") { - n[i++] = "display:none"; - } - return; - } + case "mso-zero-height": + if (value == "yes") { + n[i++] = "display:none"; + } + return; + } - // Eliminate all MS Office style definitions that have no CSS equivalent by examining the first characters in the name - if (/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(name)) { - return; - } + // Eliminate all MS Office style definitions that have no CSS equivalent by examining the first characters in the name + if (/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(name)) { + return; + } - // If it reached this point, it must be a valid CSS style - n[i++] = name + ":" + parts[1]; // Lower-case name, but keep value case - } - }); + // If it reached this point, it must be a valid CSS style + n[i++] = name + ":" + parts[1]; // Lower-case name, but keep value case + } + }); - // If style attribute contained any valid styles the re-write it; otherwise delete style attribute. - if (i > 0) { - return tag + ' style="' + n.join(';') + '"'; - } else { - return tag; - } + // If style attribute contained any valid styles the re-write it; otherwise delete style attribute. + if (i > 0) { + return tag + ' style="' + n.join(';') + '"'; + } else { + return tag; + } } ] ]); - } - } + } + } - // Replace headers with - if (getParam(ed, "paste_convert_headers_to_strong")) { - process([ + // Replace headers with + if (getParam(ed, "paste_convert_headers_to_strong")) { + process([ [/]*>/gi, "

"], [/<\/h[1-6][^>]*>/gi, "

"] ]); - } + } - // Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso"). - // Note:- paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation. - stripClass = getParam(ed, "paste_strip_class_attributes"); + // Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso"). + // Note:- paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation. + stripClass = getParam(ed, "paste_strip_class_attributes"); - if (stripClass !== "none") { - function removeClasses(match, g1) { - if (stripClass === "all") - return ''; + if (stripClass !== "none") { + function removeClasses(match, g1) { + if (stripClass === "all") + return ''; - var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "), - function(v) { - return (/^(?!mso)/i.test(v)); + var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "), + function (v) { + return (/^(?!mso)/i.test(v)); } ); - return cls.length ? ' class="' + cls.join(" ") + '"' : ''; - }; + return cls.length ? ' class="' + cls.join(" ") + '"' : ''; + }; - h = h.replace(/ class="([^"]+)"/gi, removeClasses); - h = h.replace(/ class=(\w+)/gi, removeClasses); - } + h = h.replace(/ class="([^"]+)"/gi, removeClasses); + h = h.replace(/ class=(\w+)/gi, removeClasses); + } - // Remove spans option - if (getParam(ed, "paste_remove_spans")) { - h = h.replace(/<\/?span[^>]*>/gi, ""); - } + // Remove spans option + if (getParam(ed, "paste_remove_spans")) { + h = h.replace(/<\/?span[^>]*>/gi, ""); + } - //console.log('After preprocess:' + h); + //console.log('After preprocess:' + h); - o.content = h; - }, + o.content = h; + }, - /** - * Various post process items. - */ - _postProcess : function(pl, o) { - var t = this, ed = t.editor, dom = ed.dom, styleProps; + /** + * Various post process items. + */ + _postProcess: function (pl, o) { + var t = this, ed = t.editor, dom = ed.dom, styleProps; - if (o.wordContent) { - // Remove named anchors or TOC links - each(dom.select('a', o.node), function(a) { - if (!a.href || a.href.indexOf('#_Toc') != -1) - dom.remove(a, 1); - }); + if (o.wordContent) { + // Remove named anchors or TOC links + each(dom.select('a', o.node), function (a) { + if (!a.href || a.href.indexOf('#_Toc') != -1) + dom.remove(a, 1); + }); - if (getParam(ed, "paste_convert_middot_lists")) { - t._convertLists(pl, o); - } + if (getParam(ed, "paste_convert_middot_lists")) { + t._convertLists(pl, o); + } - // Process styles - styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties + // Process styles + styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties - // Process only if a string was specified and not equal to "all" or "*" - if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) { - styleProps = tinymce.explode(styleProps.replace(/^none$/i, "")); + // Process only if a string was specified and not equal to "all" or "*" + if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) { + styleProps = tinymce.explode(styleProps.replace(/^none$/i, "")); - // Retains some style properties - each(dom.select('*', o.node), function(el) { - var newStyle = {}, npc = 0, i, sp, sv; + // Retains some style properties + each(dom.select('*', o.node), function (el) { + var newStyle = {}, npc = 0, i, sp, sv; - // Store a subset of the existing styles - if (styleProps) { - for (i = 0; i < styleProps.length; i++) { - sp = styleProps[i]; - sv = dom.getStyle(el, sp); + // Store a subset of the existing styles + if (styleProps) { + for (i = 0; i < styleProps.length; i++) { + sp = styleProps[i]; + sv = dom.getStyle(el, sp); - if (sv) { - newStyle[sp] = sv; - npc++; - } - } - } + if (sv) { + newStyle[sp] = sv; + npc++; + } + } + } - // Remove all of the existing styles - dom.setAttrib(el, 'style', ''); + // Remove all of the existing styles + dom.setAttrib(el, 'style', ''); - if (styleProps && npc > 0) - dom.setStyles(el, newStyle); // Add back the stored subset of styles - else // Remove empty span tags that do not have class attributes - if (el.nodeName == 'SPAN' && !el.className) - dom.remove(el, true); - }); - } - } + if (styleProps && npc > 0) + dom.setStyles(el, newStyle); // Add back the stored subset of styles + else // Remove empty span tags that do not have class attributes + if (el.nodeName == 'SPAN' && !el.className) + dom.remove(el, true); + }); + } + } - // Remove all style information or only specifically on WebKit to avoid the style bug on that browser - if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) { - each(dom.select('*[style]', o.node), function(el) { - el.removeAttribute('style'); - el.removeAttribute('_mce_style'); - }); - } else { - if (tinymce.isWebKit) { - // We need to compress the styles on WebKit since if you paste it will become - // Removing the mce_style that contains the real value will force the Serializer engine to compress the styles - each(dom.select('*', o.node), function(el) { - el.removeAttribute('_mce_style'); - }); - } - } - }, + // Remove all style information or only specifically on WebKit to avoid the style bug on that browser + if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) { + each(dom.select('*[style]', o.node), function (el) { + el.removeAttribute('style'); + el.removeAttribute('_mce_style'); + }); + } else { + if (tinymce.isWebKit) { + // We need to compress the styles on WebKit since if you paste it will become + // Removing the mce_style that contains the real value will force the Serializer engine to compress the styles + each(dom.select('*', o.node), function (el) { + el.removeAttribute('_mce_style'); + }); + } + } + }, - /** - * Converts the most common bullet and number formats in Office into a real semantic UL/LI list. - */ - _convertLists : function(pl, o) { - var dom = pl.editor.dom, listElm, li, lastMargin = -1, margin, levels = [], lastType, html; + /** + * Converts the most common bullet and number formats in Office into a real semantic UL/LI list. + */ + _convertLists: function (pl, o) { + var dom = pl.editor.dom, listElm, li, lastMargin = -1, margin, levels = [], lastType, html; - // Convert middot lists into real semantic lists - each(dom.select('p', o.node), function(p) { - var sib, val = '', type, html, idx, parents; + // Convert middot lists into real semantic lists + each(dom.select('p', o.node), function (p) { + var sib, val = '', type, html, idx, parents; - // Get text node value at beginning of paragraph - for (sib = p.firstChild; sib && sib.nodeType == 3; sib = sib.nextSibling) - val += sib.nodeValue; + // Get text node value at beginning of paragraph + for (sib = p.firstChild; sib && sib.nodeType == 3; sib = sib.nextSibling) + val += sib.nodeValue; - val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/ /g, '\u00a0'); + val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/ /g, '\u00a0'); - // Detect unordered lists look for bullets - if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val)) - type = 'ul'; + // Detect unordered lists look for bullets + if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val)) + type = 'ul'; - // Detect ordered lists 1., a. or ixv. - if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val)) - type = 'ol'; + // Detect ordered lists 1., a. or ixv. + if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val)) + type = 'ol'; - // Check if node value matches the list pattern: o   - if (type) { - margin = parseFloat(p.style.marginLeft || 0); + // Check if node value matches the list pattern: o   + if (type) { + margin = parseFloat(p.style.marginLeft || 0); - if (margin > lastMargin) - levels.push(margin); + if (margin > lastMargin) + levels.push(margin); - if (!listElm || type != lastType) { - listElm = dom.create(type); - dom.insertAfter(listElm, p); - } else { - // Nested list element - if (margin > lastMargin) { - listElm = li.appendChild(dom.create(type)); - } else if (margin < lastMargin) { - // Find parent level based on margin value - idx = tinymce.inArray(levels, margin); - parents = dom.getParents(listElm.parentNode, type); - listElm = parents[parents.length - 1 - idx] || listElm; - } - } + if (!listElm || type != lastType) { + listElm = dom.create(type); + dom.insertAfter(listElm, p); + } else { + // Nested list element + if (margin > lastMargin) { + listElm = li.appendChild(dom.create(type)); + } else if (margin < lastMargin) { + // Find parent level based on margin value + idx = tinymce.inArray(levels, margin); + parents = dom.getParents(listElm.parentNode, type); + listElm = parents[parents.length - 1 - idx] || listElm; + } + } - // Remove middot or number spans if they exists - each(dom.select('span', p), function(span) { - var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, ''); + // Remove middot or number spans if they exists + each(dom.select('span', p), function (span) { + var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, ''); - // Remove span with the middot or the number - if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html)) - dom.remove(span); - else if (/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(html)) - dom.remove(span); - }); + // Remove span with the middot or the number + if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html)) + dom.remove(span); + else if (/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(html)) + dom.remove(span); + }); - html = p.innerHTML; + html = p.innerHTML; - // Remove middot/list items - if (type == 'ul') - html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/, ''); - else - html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.( |\u00a0)+\s*/, ''); + // Remove middot/list items + if (type == 'ul') + html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/, ''); + else + html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.( |\u00a0)+\s*/, ''); - // Create li and add paragraph data into the new li - li = listElm.appendChild(dom.create('li', 0, html)); - dom.remove(p); + // Create li and add paragraph data into the new li + li = listElm.appendChild(dom.create('li', 0, html)); + dom.remove(p); - lastMargin = margin; - lastType = type; - } else - listElm = lastMargin = 0; // End list element - }); + lastMargin = margin; + lastType = type; + } else + listElm = lastMargin = 0; // End list element + }); - // Remove any left over makers - html = o.node.innerHTML; - if (html.indexOf('__MCE_ITEM__') != -1) - o.node.innerHTML = html.replace(/__MCE_ITEM__/g, ''); - }, + // Remove any left over makers + html = o.node.innerHTML; + if (html.indexOf('__MCE_ITEM__') != -1) + o.node.innerHTML = html.replace(/__MCE_ITEM__/g, ''); + }, - /** - * This method will split the current block parent and insert the contents inside the split position. - * This logic can be improved so text nodes at the start/end remain in the start/end block elements - */ - _insertBlockContent : function(ed, dom, content) { - var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker'; + /** + * This method will split the current block parent and insert the contents inside the split position. + * This logic can be improved so text nodes at the start/end remain in the start/end block elements + */ + _insertBlockContent: function (ed, dom, content) { + var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker'; - function select(n) { - var r; + function select(n) { + var r; - if (tinymce.isIE) { - r = ed.getDoc().body.createTextRange(); - r.moveToElementText(n); - r.collapse(false); - r.select(); - } else { - sel.select(n, 1); - sel.collapse(false); - } - } + if (tinymce.isIE) { + r = ed.getDoc().body.createTextRange(); + r.moveToElementText(n); + r.collapse(false); + r.select(); + } else { + sel.select(n, 1); + sel.collapse(false); + } + } - // Insert a marker for the caret position - this._insert('', 1); - marker = dom.get(markerId); - parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td'); + // Insert a marker for the caret position + this._insert('', 1); + marker = dom.get(markerId); + parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td'); - // If it's a parent block but not a table cell - if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) { - // Split parent block - marker = dom.split(parentBlock, marker); + // If it's a parent block but not a table cell + if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) { + // Split parent block + marker = dom.split(parentBlock, marker); - // Insert nodes before the marker - each(dom.create('div', 0, content).childNodes, function(n) { - last = marker.parentNode.insertBefore(n.cloneNode(true), marker); - }); + // Insert nodes before the marker + each(dom.create('div', 0, content).childNodes, function (n) { + last = marker.parentNode.insertBefore(n.cloneNode(true), marker); + }); - // Move caret after marker - select(last); - } else { - dom.setOuterHTML(marker, content); - sel.select(ed.getBody(), 1); - sel.collapse(0); - } + // Move caret after marker + select(last); + } else { + dom.setOuterHTML(marker, content); + sel.select(ed.getBody(), 1); + sel.collapse(0); + } - // Remove marker if it's left - while (elm = dom.get(markerId)) - dom.remove(elm); + // Remove marker if it's left + while (elm = dom.get(markerId)) + dom.remove(elm); - // Get element, position and height - elm = sel.getStart(); - vp = dom.getViewPort(ed.getWin()); - y = ed.dom.getPos(elm).y; - elmHeight = elm.clientHeight; + // Get element, position and height + elm = sel.getStart(); + vp = dom.getViewPort(ed.getWin()); + y = ed.dom.getPos(elm).y; + elmHeight = elm.clientHeight; - // Is element within viewport if not then scroll it into view - if (y < vp.y || y + elmHeight > vp.y + vp.h) - ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25; - }, + // Is element within viewport if not then scroll it into view + if (y < vp.y || y + elmHeight > vp.y + vp.h) + ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25; + }, - /** - * Inserts the specified contents at the caret position. - */ - _insert : function(h, skip_undo) { - var ed = this.editor, r = ed.selection.getRng(); + /** + * Inserts the specified contents at the caret position. + */ + _insert: function (h, skip_undo) { + var ed = this.editor, r = ed.selection.getRng(); - // First delete the contents seems to work better on WebKit when the selection spans multiple list items or multiple table cells. - if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer) - ed.getDoc().execCommand('Delete', false, null); + // First delete the contents seems to work better on WebKit when the selection spans multiple list items or multiple table cells. + if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer) + ed.getDoc().execCommand('Delete', false, null); - // It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents - ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo}); - }, + // It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents + ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, { skip_undo: skip_undo }); + }, - /** - * Instead of the old plain text method which tried to re-create a paste operation, the - * new approach adds a plain text mode toggle switch that changes the behavior of paste. - * This function is passed the same input that the regular paste plugin produces. - * It performs additional scrubbing and produces (and inserts) the plain text. - * This approach leverages all of the great existing functionality in the paste - * plugin, and requires minimal changes to add the new functionality. - * Speednet - June 2009 - */ - _insertPlainText : function(ed, dom, h) { - var i, len, pos, rpos, node, breakElms, before, after, + /** + * Instead of the old plain text method which tried to re-create a paste operation, the + * new approach adds a plain text mode toggle switch that changes the behavior of paste. + * This function is passed the same input that the regular paste plugin produces. + * It performs additional scrubbing and produces (and inserts) the plain text. + * This approach leverages all of the great existing functionality in the paste + * plugin, and requires minimal changes to add the new functionality. + * Speednet - June 2009 + */ + _insertPlainText: function (ed, dom, h) { + var i, len, pos, rpos, node, breakElms, before, after, w = ed.getWin(), d = ed.getDoc(), sel = ed.selection, @@ -771,194 +771,194 @@ linebr = getParam(ed, "paste_text_linebreaktype"), rl = getParam(ed, "paste_text_replacements"); - function process(items) { - each(items, function(v) { - if (v.constructor == RegExp) - h = h.replace(v, ""); - else - h = h.replace(v[0], v[1]); - }); - }; + function process(items) { + each(items, function (v) { + if (v.constructor == RegExp) + h = h.replace(v, ""); + else + h = h.replace(v[0], v[1]); + }); + }; - if ((typeof(h) === "string") && (h.length > 0)) { - if (!entities) - entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(","); + if ((typeof (h) === "string") && (h.length > 0)) { + if (!entities) + entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(","); - // If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line - if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) { - process([ + // If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line + if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) { + process([ /[\n\r]+/g ]); - } else { - // Otherwise just get rid of carriage returns (only need linefeeds) - process([ + } else { + // Otherwise just get rid of carriage returns (only need linefeeds) + process([ /\r+/g ]); - } + } - process([ - [/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi, "\n\n"], // Block tags get a blank line after them - [/]*>|<\/tr>/gi, "\n"], // Single linebreak for
tags and table rows - [/<\/t[dh]>\s*]*>/gi, "\t"], // Table cells get tabs betweem them - /<[a-z!\/?][^>]*>/gi, // Delete all remaining tags - [/ /gi, " "], // Convert non-break spaces to regular spaces (remember, *plain text*) + process([ + [/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi, "\n\n"], // Block tags get a blank line after them + [/]*>|<\/tr>/gi, "\n"], // Single linebreak for
tags and table rows + [/<\/t[dh]>\s*]*>/gi, "\t"], // Table cells get tabs betweem them + /<[a-z!\/?][^>]*>/gi, // Delete all remaining tags + [/ /gi, " "], // Convert non-break spaces to regular spaces (remember, *plain text*) [ - // HTML entity + // HTML entity /&(#\d+|[a-z0-9]{1,10});/gi, - // Replace with actual character - function(e, s) { - if (s.charAt(0) === "#") { - return String.fromCharCode(s.slice(1)); - } - else { - return ((e = inArray(entities, s)) > 0)? String.fromCharCode(entities[e-1]) : " "; - } + // Replace with actual character + function (e, s) { + if (s.charAt(0) === "#") { + return String.fromCharCode(s.slice(1)); + } + else { + return ((e = inArray(entities, s)) > 0) ? String.fromCharCode(entities[e - 1]) : " "; + } } ], - [/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"], // Cool little RegExp deletes whitespace around linebreak chars. - [/\n{3,}/g, "\n\n"], // Max. 2 consecutive linebreaks + [/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"], // Cool little RegExp deletes whitespace around linebreak chars. + [/\n{3,}/g, "\n\n"], // Max. 2 consecutive linebreaks /^\s+|\s+$/g // Trim the front & back ]); - h = dom.encode(h); + h = dom.encode(h); - // Delete any highlighted text before pasting - if (!sel.isCollapsed()) { - d.execCommand("Delete", false, null); - } + // Delete any highlighted text before pasting + if (!sel.isCollapsed()) { + d.execCommand("Delete", false, null); + } - // Perform default or custom replacements - if (is(rl, "array") || (is(rl, "array"))) { - process(rl); - } - else if (is(rl, "string")) { - process(new RegExp(rl, "gi")); - } + // Perform default or custom replacements + if (is(rl, "array") || (is(rl, "array"))) { + process(rl); + } + else if (is(rl, "string")) { + process(new RegExp(rl, "gi")); + } - // Treat paragraphs as specified in the config - if (linebr == "none") { - process([ + // Treat paragraphs as specified in the config + if (linebr == "none") { + process([ [/\n+/g, " "] ]); - } - else if (linebr == "br") { - process([ + } + else if (linebr == "br") { + process([ [/\n/g, "
"] ]); - } - else { - process([ + } + else { + process([ /^\s+|\s+$/g, [/\n\n/g, "

"], [/\n/g, "
"] ]); - } + } - // This next piece of code handles the situation where we're pasting more than one paragraph of plain - // text, and we are pasting the content into the middle of a block node in the editor. The block - // node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining). - // The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the - // pasted text is prepended to "Para B". Any other paragraphs of pasted text are placed between - // "Para A" and "Para B". This code solves a host of problems with the original plain text plugin and - // now handles styles correctly. (Pasting plain text into a styled paragraph is supposed to make the - // plain text take the same style as the existing paragraph.) - if ((pos = h.indexOf("

")) != -1) { - rpos = h.lastIndexOf("

"); - node = sel.getNode(); - breakElms = []; // Get list of elements to break + // This next piece of code handles the situation where we're pasting more than one paragraph of plain + // text, and we are pasting the content into the middle of a block node in the editor. The block + // node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining). + // The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the + // pasted text is prepended to "Para B". Any other paragraphs of pasted text are placed between + // "Para A" and "Para B". This code solves a host of problems with the original plain text plugin and + // now handles styles correctly. (Pasting plain text into a styled paragraph is supposed to make the + // plain text take the same style as the existing paragraph.) + if ((pos = h.indexOf("

")) != -1) { + rpos = h.lastIndexOf("

"); + node = sel.getNode(); + breakElms = []; // Get list of elements to break - do { - if (node.nodeType == 1) { - // Don't break tables and break at body - if (node.nodeName == "TD" || node.nodeName == "BODY") { - break; - } + do { + if (node.nodeType == 1) { + // Don't break tables and break at body + if (node.nodeName == "TD" || node.nodeName == "BODY") { + break; + } - breakElms[breakElms.length] = node; - } - } while (node = node.parentNode); + breakElms[breakElms.length] = node; + } + } while (node = node.parentNode); - // Are we in the middle of a block node? - if (breakElms.length > 0) { - before = h.substring(0, pos); - after = ""; + // Are we in the middle of a block node? + if (breakElms.length > 0) { + before = h.substring(0, pos); + after = ""; - for (i=0, len=breakElms.length; i"; - after += "<" + breakElms[breakElms.length-i-1].nodeName.toLowerCase() + ">"; - } + for (i = 0, len = breakElms.length; i < len; i++) { + before += ""; + after += "<" + breakElms[breakElms.length - i - 1].nodeName.toLowerCase() + ">"; + } - if (pos == rpos) { - h = before + after + h.substring(pos+7); - } - else { - h = before + h.substring(pos+4, rpos+4) + after + h.substring(rpos+7); - } - } - } + if (pos == rpos) { + h = before + after + h.substring(pos + 7); + } + else { + h = before + h.substring(pos + 4, rpos + 4) + after + h.substring(rpos + 7); + } + } + } - // Insert content at the caret, plus add a marker for repositioning the caret - ed.execCommand("mceInsertRawHTML", false, h + ' '); + // Insert content at the caret, plus add a marker for repositioning the caret + ed.execCommand("mceInsertRawHTML", false, h + ' '); - // Reposition the caret to the marker, which was placed immediately after the inserted content. - // Needs to be done asynchronously (in window.setTimeout) or else it doesn't work in all browsers. - // The second part of the code scrolls the content up if the caret is positioned off-screen. - // This is only necessary for WebKit browsers, but it doesn't hurt to use for all. - window.setTimeout(function() { - var marker = dom.get('_plain_text_marker'), + // Reposition the caret to the marker, which was placed immediately after the inserted content. + // Needs to be done asynchronously (in window.setTimeout) or else it doesn't work in all browsers. + // The second part of the code scrolls the content up if the caret is positioned off-screen. + // This is only necessary for WebKit browsers, but it doesn't hurt to use for all. + window.setTimeout(function () { + var marker = dom.get('_plain_text_marker'), elm, vp, y, elmHeight; - sel.select(marker, false); - d.execCommand("Delete", false, null); - marker = null; + sel.select(marker, false); + d.execCommand("Delete", false, null); + marker = null; - // Get element, position and height - elm = sel.getStart(); - vp = dom.getViewPort(w); - y = dom.getPos(elm).y; - elmHeight = elm.clientHeight; + // Get element, position and height + elm = sel.getStart(); + vp = dom.getViewPort(w); + y = dom.getPos(elm).y; + elmHeight = elm.clientHeight; - // Is element within viewport if not then scroll it into view - if ((y < vp.y) || (y + elmHeight > vp.y + vp.h)) { - d.body.scrollTop = y < vp.y ? y : y - vp.h + 25; - } - }, 0); - } - }, + // Is element within viewport if not then scroll it into view + if ((y < vp.y) || (y + elmHeight > vp.y + vp.h)) { + d.body.scrollTop = y < vp.y ? y : y - vp.h + 25; + } + }, 0); + } + }, - /** - * This method will open the old style paste dialogs. Some users might want the old behavior but still use the new cleanup engine. - */ - _legacySupport : function() { - var t = this, ed = t.editor; + /** + * This method will open the old style paste dialogs. Some users might want the old behavior but still use the new cleanup engine. + */ + _legacySupport: function () { + var t = this, ed = t.editor; - // Register command(s) for backwards compatibility - ed.addCommand("mcePasteWord", function() { - ed.windowManager.open({ - file: t.url + "/pasteword.htm", - width: parseInt(getParam(ed, "paste_dialog_width")), - height: parseInt(getParam(ed, "paste_dialog_height")), - inline: 1 - }); - }); + // Register command(s) for backwards compatibility + ed.addCommand("mcePasteWord", function () { + ed.windowManager.open({ + file: t.url + "/pasteword.htm", + width: parseInt(getParam(ed, "paste_dialog_width")), + height: parseInt(getParam(ed, "paste_dialog_height")), + inline: 1 + }); + }); - if (getParam(ed, "paste_text_use_dialog")) { - ed.addCommand("mcePasteText", function() { - ed.windowManager.open({ - file : t.url + "/pastetext.htm", - width: parseInt(getParam(ed, "paste_dialog_width")), - height: parseInt(getParam(ed, "paste_dialog_height")), - inline : 1 - }); - }); - } + if (getParam(ed, "paste_text_use_dialog")) { + ed.addCommand("mcePasteText", function () { + ed.windowManager.open({ + file: t.url + "/pastetext.htm", + width: parseInt(getParam(ed, "paste_dialog_width")), + height: parseInt(getParam(ed, "paste_dialog_height")), + inline: 1 + }); + }); + } - // Register button for backwards compatibility - ed.addButton("pasteword", {title : "paste.paste_word_desc", cmd : "mcePasteWord"}); - } - }); + // Register button for backwards compatibility + ed.addButton("pasteword", { title: "paste.paste_word_desc", cmd: "mcePasteWord" }); + } + }); - // Register plugin - tinymce.PluginManager.add("paste", tinymce.plugins.PastePlugin); + // Register plugin + tinymce.PluginManager.add("paste", tinymce.plugins.PastePlugin); })(); From d8c98ccfd812d68abbbebd6c4ea844863914458e Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Thu, 20 Jan 2011 09:23:04 -0100 Subject: [PATCH 2/5] WIP installer db step refactor --- .../presentation/install/steps/database.ascx | 234 +++++++++++++----- .../install/steps/database.ascx.cs | 18 +- .../install/steps/database.ascx.designer.cs | 18 +- .../umbraco_client/Installer/css/all.css | 10 + .../Installer/js/jquery.main.js | 49 ++-- 5 files changed, 232 insertions(+), 97 deletions(-) diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index d7fc9ef3d7..ebb9d23612 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -19,50 +19,62 @@

- 1. Do you have a blank database already installed OR do you want to use a SQL CE 4 embedded database?

- + 1. Select which database option best fits you:

+ +
    +
  • + + + +
    • +
  • + + + +
    • +
  • + + + +
    • +
  • + + + +
    • +
+
- -
-
-
-

- 2. Now choose your database type below.

-
- - - - - - - -
-
-
-
+ +
+ + + +
+ +
+
+

+ 2. Now choose your database type below.

+
+ + + + + + +
+
+
+ + +

3. Connection details: Please fill out the connection information for your database.

- - - +
@@ -71,7 +83,7 @@

@@ -94,7 +106,52 @@
-
+ +
+
+ + +
+
+ + +
+
+
+ +

+ 2. Simple file-based database:

+
+ + + + +
+
+
+
+ +
+
+
+

+ 2. Connection details: Please fill out the connection information for your database.

+ +
+ +
Connection string: @@ -102,29 +159,40 @@

Example: datalayer=MySQL;server=192.168.2.8;user id=user;password=***;database=umbraco

-
-
-
- -
+
+ +
+
+
+
+ + +
+
+
+

+ 2. Getting a database setup for umbraco.
+ For first time users, we recommend you select "quick-and-simple file-based database". + This will install an easy to use database, that does + not require any additional software to use.
+ Alternatively, you can install Microsoft SQL Server, which will require a bit more + work to get up and running.
+ We have provided a step-by-step guide in the video instructions below. +

+ Open video instructions +
+
+
+ +
 
install
-
-
- -
-
-

- 2. Getting a database setup for umbraco.
- For first time users, we recommend you select "SQL CE 4" in the dropdown box, after clicking the "yes" button. - This will install an easy to use database, that does not require any additional software to use.
- Alternatively, you can install Microsoft SQL Server, which will require a bit more work to get up and running.
- We have provided a step-by-step guide in the video instructions below. -

- Open video instructions -
-
+ + + + + @@ -136,8 +204,52 @@ jQuery(document).ready(function(){ + + + + $("input[name='database']").change(function() + { + + switch($(this).val()) + { + case "blank": + + $(".database-option").hide(); + $("#database-blank").show(); + + break; + case "embedded": + $(".database-option").hide(); + $("#database-embedded").show(); + + if (!hasEmbeddedDlls) { + $('.embeddedError').show(); + $(".installbtn").hide(); + } + else { + $('.embedded').show(); + $(".installbtn").show(); + } + + break; + case "advanced": + $(".database-option").hide(); + $("#database-advanced").show(); + $(".installbtn").show(); + break; + case "help": + $(".database-option").hide(); + $("#database-help").show(); + $(".installbtn").hide(); + break; + } + + + }); + + }); - + diff --git a/umbraco/presentation/install/steps/database.ascx.cs b/umbraco/presentation/install/steps/database.ascx.cs index cb8c0ca366..9da7c75062 100644 --- a/umbraco/presentation/install/steps/database.ascx.cs +++ b/umbraco/presentation/install/steps/database.ascx.cs @@ -46,7 +46,7 @@ namespace umbraco.presentation.install.steps /// protected bool IsEmbeddedDatabase { - get { return DatabaseType.SelectedValue.ToLower().Contains("sqlce"); } + get { return Request["database"] == "embedded"; } } protected bool IsConfigured @@ -76,7 +76,7 @@ namespace umbraco.presentation.install.steps /// protected bool ManualConnectionString { - get { return DatabaseType.SelectedItem.Value == "Custom"; } + get { return Request["database"] == "advanced"; } } /// @@ -134,7 +134,7 @@ namespace umbraco.presentation.install.steps toggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase); toggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase); - toggleVisible(DatabaseConnectionString, ManualConnectionString); + //toggleVisible(DatabaseConnectionString, ManualConnectionString); // Make sure ASP.Net displays the password text DatabasePassword.Attributes["value"] = DatabasePassword.Text; @@ -248,13 +248,19 @@ namespace umbraco.presentation.install.steps connectionStringBuilder["user id"] = DatabaseUsername.Text; connectionStringBuilder["password"] = DatabasePassword.Text; } - else if (DatabaseType.SelectedValue == ("SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco")) + else if (Request["database"] == "embedded") { connectionStringBuilder.ConnectionString = @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\Umbraco.sdf"; } - if (!String.IsNullOrEmpty(DatabaseType.SelectedValue) && !DatabaseType.SelectedValue.Contains("SqlServer") && !DatabaseType.SelectedValue.Contains("Custom")) + if (!String.IsNullOrEmpty(Request["database"]) && !String.IsNullOrEmpty(DatabaseType.SelectedValue) && !DatabaseType.SelectedValue.Contains("SqlServer") + && Request["database"] != "advanced") + { connectionStringBuilder["datalayer"] = DatabaseType.SelectedValue; + } + + //if (!String.IsNullOrEmpty(DatabaseType.SelectedValue) && !DatabaseType.SelectedValue.Contains("SqlServer") && !DatabaseType.SelectedValue.Contains("Custom")) + // connectionStringBuilder["datalayer"] = DatabaseType.SelectedValue; return connectionStringBuilder; } @@ -284,7 +290,7 @@ namespace umbraco.presentation.install.steps toggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase); toggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase); - toggleVisible(DatabaseConnectionString, ManualConnectionString); + //toggleVisible(DatabaseConnectionString, ManualConnectionString); } private void toggleVisible(HtmlGenericControl div, bool visible) diff --git a/umbraco/presentation/install/steps/database.ascx.designer.cs b/umbraco/presentation/install/steps/database.ascx.designer.cs index d7e70b8435..ff51ca5e86 100644 --- a/umbraco/presentation/install/steps/database.ascx.designer.cs +++ b/umbraco/presentation/install/steps/database.ascx.designer.cs @@ -30,15 +30,6 @@ namespace umbraco.presentation.install.steps { /// protected global::System.Web.UI.WebControls.DropDownList DatabaseType; - /// - /// embeddedFilesMissing control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl embeddedFilesMissing; - /// /// ph_dbError control. /// @@ -165,6 +156,15 @@ namespace umbraco.presentation.install.steps { /// protected global::System.Web.UI.WebControls.TextBox DatabasePassword; + /// + /// embeddedFilesMissing control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl embeddedFilesMissing; + /// /// DatabaseConnectionString control. /// diff --git a/umbraco/presentation/umbraco_client/Installer/css/all.css b/umbraco/presentation/umbraco_client/Installer/css/all.css index c2647a24a1..82a844f89f 100644 --- a/umbraco/presentation/umbraco_client/Installer/css/all.css +++ b/umbraco/presentation/umbraco_client/Installer/css/all.css @@ -1150,3 +1150,13 @@ figure{display: block;} .error {padding:0 100px 13px 5px} .error p{margin:0 0 13px;padding-right:100px;} .error p strong {font-size:14px;display:block;} + +/* db step refactor */ +.database-option, footer.installbtn +{ + display:none; +} +.custom +{ + display: +} \ No newline at end of file diff --git a/umbraco/presentation/umbraco_client/Installer/js/jquery.main.js b/umbraco/presentation/umbraco_client/Installer/js/jquery.main.js index 53d96df275..2c44df87ba 100644 --- a/umbraco/presentation/umbraco_client/Installer/js/jquery.main.js +++ b/umbraco/presentation/umbraco_client/Installer/js/jquery.main.js @@ -143,42 +143,49 @@ function initTabs() { }); } -//add by pph +//add by pph, updated by tg for db step refactor function toggleDatabaseOption(selectValNew) { - var step1 = '#database-step1'; + + + + var step1 = '#database-options'; //Defensive if else to prevent this being executed on non database pages if (jQuery(step1).length) { + + + var instructionText = jQuery(step1 + ' .instructionText'); - var buttonBox = jQuery('.btn-box'); + var buttonBox = jQuery('.installbtn'); + //hide instructions - jQuery('#database-step2').hide(); - instructionText.hide(); + jQuery('#database-blank-inputs').hide(); + //instructionText.hide(); buttonBox.hide(); //hide all db options - jQuery(step1 + ' .row').hide(); + //jQuery(step1 + ' .row').hide(); if (selectValNew != '') { if (selectValNew == 'SqlServer' || selectValNew == 'MySql') { - jQuery(step1 + ' .sql').show(); - instructionText.show(); - buttonBox.show(); - } - else if (selectValNew == 'Custom') { - jQuery(step1 + ' .custom').show(); - instructionText.show(); - buttonBox.show(); - } - else if (selectValNew.indexOf('SQLCE4Umbraco') > -1 && !hasEmbeddedDlls) { - jQuery(step1 + ' .embeddedError').show(); - } - else if (selectValNew.indexOf('SQLCE4Umbraco') > -1) { - jQuery(step1 + ' .embedded').show(); - instructionText.show(); + jQuery('#database-blank-inputs').show(); + //instructionText.show(); buttonBox.show(); } +// else if (selectValNew == 'Custom') { +// jQuery(step1 + ' .custom').show(); +// instructionText.show(); +// buttonBox.show(); +// } +// else if (selectValNew.indexOf('SQLCE4Umbraco') > -1 && !hasEmbeddedDlls) { +// jQuery(step1 + ' .embeddedError').show(); +// } +// else if (selectValNew.indexOf('SQLCE4Umbraco') > -1) { +// jQuery(step1 + ' .embedded').show(); +// instructionText.show(); +// buttonBox.show(); +// } } } } From 2af1812b019c6af85fc1ae14e176affa2421de8c Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Thu, 20 Jan 2011 09:45:34 -0100 Subject: [PATCH 3/5] WIP installer db step refactor, opens video help link in new window --- umbraco/presentation/install/steps/database.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index ebb9d23612..d87cb3f12d 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -179,7 +179,7 @@ work to get up and running.
We have provided a step-by-step guide in the video instructions below.

- Open video instructions + Open video instructions From 447582b01815f4a2b06f29b4c75898e2a89b443b Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Thu, 20 Jan 2011 11:10:19 -0100 Subject: [PATCH 4/5] Update to installer, adds continue button to validate permissions step --- .../install/steps/validatePermissions.ascx | 7 ++++++- .../install/steps/validatePermissions.ascx.cs | 5 +++++ .../steps/validatePermissions.ascx.designer.cs | 12 ++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/umbraco/presentation/install/steps/validatePermissions.ascx b/umbraco/presentation/install/steps/validatePermissions.ascx index 1947d635ff..3a4d28b270 100644 --- a/umbraco/presentation/install/steps/validatePermissions.ascx +++ b/umbraco/presentation/install/steps/validatePermissions.ascx @@ -93,4 +93,9 @@ In order to run umbraco, you'll need to update your permission settings.

- \ No newline at end of file + + +
+
 
+ Continue anyway +
\ No newline at end of file diff --git a/umbraco/presentation/install/steps/validatePermissions.ascx.cs b/umbraco/presentation/install/steps/validatePermissions.ascx.cs index 2b6b2960e7..3b34af4f18 100644 --- a/umbraco/presentation/install/steps/validatePermissions.ascx.cs +++ b/umbraco/presentation/install/steps/validatePermissions.ascx.cs @@ -184,6 +184,11 @@ namespace umbraco.presentation.install.steps return true; } + protected void gotoNextStep(object sender, EventArgs e) + { + Helper.RedirectToNextStep(this.Page); + } + #region Web Form Designer generated code protected override void OnInit(EventArgs e) diff --git a/umbraco/presentation/install/steps/validatePermissions.ascx.designer.cs b/umbraco/presentation/install/steps/validatePermissions.ascx.designer.cs index a3eef15e5c..14cc879d93 100644 --- a/umbraco/presentation/install/steps/validatePermissions.ascx.designer.cs +++ b/umbraco/presentation/install/steps/validatePermissions.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -120,5 +119,14 @@ namespace umbraco.presentation.install.steps { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Literal foldersResult; + + /// + /// btnNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnNext; } } From bae04cd27e0b5daa9ea0fcc8602b35b94ed4ec96 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Thu, 20 Jan 2011 11:42:26 -0100 Subject: [PATCH 5/5] WIP installer db step update --- umbraco/presentation/install/steps/database.ascx | 1 + umbraco/presentation/install/steps/database.ascx.cs | 11 +++++++++-- .../install/steps/database.ascx.designer.cs | 9 +++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index d87cb3f12d..edcfef719e 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -247,6 +247,7 @@ }); + }); diff --git a/umbraco/presentation/install/steps/database.ascx.cs b/umbraco/presentation/install/steps/database.ascx.cs index 9da7c75062..22c2ca313d 100644 --- a/umbraco/presentation/install/steps/database.ascx.cs +++ b/umbraco/presentation/install/steps/database.ascx.cs @@ -46,7 +46,7 @@ namespace umbraco.presentation.install.steps /// protected bool IsEmbeddedDatabase { - get { return Request["database"] == "embedded"; } + get { return Request["database"] == "embedded" || GlobalSettings.DbDSN.ToLower().Contains("SQLCE4Umbraco.SqlCEHelper".ToLower()); } } protected bool IsConfigured @@ -133,7 +133,14 @@ namespace umbraco.presentation.install.steps toggleVisible(DatabaseUsernameItem, !ManualConnectionString && !IsEmbeddedDatabase); toggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase); toggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase); - + + + if (IsEmbeddedDatabase) + dbinit.Text = "$('#databaseOptionEmbedded').click();$('#databaseOptionEmbedded').change();"; + else if(ManualConnectionString) + dbinit.Text = "$('#databaseOptionAdvanced').click();$('#databaseOptionAdvanced').change();"; + else if(DatabaseType.SelectedValue == "SqlServer") + dbinit.Text = "$('#databaseOptionBlank').click();$('#databaseOptionBlank').change();"; //toggleVisible(DatabaseConnectionString, ManualConnectionString); // Make sure ASP.Net displays the password text diff --git a/umbraco/presentation/install/steps/database.ascx.designer.cs b/umbraco/presentation/install/steps/database.ascx.designer.cs index ff51ca5e86..d54355b647 100644 --- a/umbraco/presentation/install/steps/database.ascx.designer.cs +++ b/umbraco/presentation/install/steps/database.ascx.designer.cs @@ -201,6 +201,15 @@ namespace umbraco.presentation.install.steps { /// protected global::System.Web.UI.WebControls.Literal jsVars; + /// + /// dbinit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal dbinit; + /// /// installing control. ///