From c6afe2dd3ebdaa7fde5830020ab9140ccef39bcd Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 16 Jul 2014 00:10:17 +0000 Subject: [PATCH] TinyMCE wpView: - Cast off commands targeted to a view except undo, redo, RemoveFormat and mceToggleFormat (bold, italic, etc.). - Disable the link and unlink buttons when a view is selected. Props avryl, see #28595 Built from https://develop.svn.wordpress.org/trunk@29183 git-svn-id: http://core.svn.wordpress.org/trunk@28967 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wplink/plugin.js | 5 +++-- .../js/tinymce/plugins/wplink/plugin.min.js | 2 +- .../js/tinymce/plugins/wpview/plugin.js | 20 +++++++++++++++--- .../js/tinymce/plugins/wpview/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 127324 -> 127384 bytes wp-includes/version.php | 2 +- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js index d992360b86..8c055857fb 100644 --- a/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -15,9 +15,10 @@ tinymce.PluginManager.add( 'wplink', function( editor ) { editor.addShortcut( 'ctrl+k', '', 'WP_Link' ); function setState( button, node ) { - var parent = editor.dom.getParent( node, 'a' ); + var parent = editor.dom.getParent( node, 'a' ), + getView = editor.plugins.wpview ? editor.plugins.wpview.getView : function() { return false; }; - button.disabled( ( editor.selection.isCollapsed() && ! parent ) || ( parent && ! parent.href ) ); + button.disabled( ( editor.selection.isCollapsed() && ! parent ) || ( parent && ! parent.href ) || getView( node ) ); button.active( parent && parent.href ); } diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js index dc282b9f3c..32203b75ca 100644 --- a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wplink",function(a){function b(b,c){var d=a.dom.getParent(c,"a");b.disabled(a.selection.isCollapsed()&&!d||d&&!d.href),b.active(d&&d.href)}var c;a.addCommand("WP_Link",function(){c&&c.disabled()||"undefined"==typeof window.wpLink||window.wpLink.open(a.id)}),a.addShortcut("alt+shift+a","","WP_Link"),a.addShortcut("ctrl+k","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Alt+Shift+A",cmd:"WP_Link",onPostRender:function(){c=this,a.on("nodechange",function(a){b(c,a.element)})}}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",onPostRender:function(){var c=this;a.on("nodechange",function(a){b(c,a.element)})}}),a.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Alt+Shift+A",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0})}); \ No newline at end of file +tinymce.PluginManager.add("wplink",function(a){function b(b,c){var d=a.dom.getParent(c,"a"),e=a.plugins.wpview?a.plugins.wpview.getView:function(){return!1};b.disabled(a.selection.isCollapsed()&&!d||d&&!d.href||e(c)),b.active(d&&d.href)}var c;a.addCommand("WP_Link",function(){c&&c.disabled()||"undefined"==typeof window.wpLink||window.wpLink.open(a.id)}),a.addShortcut("alt+shift+a","","WP_Link"),a.addShortcut("ctrl+k","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Alt+Shift+A",cmd:"WP_Link",onPostRender:function(){c=this,a.on("nodechange",function(a){b(c,a.element)})}}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",onPostRender:function(){var c=this;a.on("nodechange",function(a){b(c,a.element)})}}),a.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Alt+Shift+A",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0})}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpview/plugin.js b/wp-includes/js/tinymce/plugins/wpview/plugin.js index d9ca259117..b74debcddd 100644 --- a/wp-includes/js/tinymce/plugins/wpview/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpview/plugin.js @@ -1,4 +1,5 @@ /* global tinymce */ + /** * WordPress View plugin. */ @@ -21,7 +22,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) { */ function getParent( node, className ) { while ( node && node.parentNode ) { - if ( node.className && (' ' + node.className + ' ').indexOf(' ' + className + ' ') !== -1 ) { + if ( node.className && ( ' ' + node.className + ' ' ).indexOf( ' ' + className + ' ' ) !== -1 ) { return node; } @@ -563,7 +564,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) { editor.dom.removeClass( editor.getBody(), 'has-focus' ); } ); - editor.on( 'nodechange', function( event ) { + editor.on( 'NodeChange', function( event ) { var dom = editor.dom, views = editor.dom.select( '.wpview-wrap' ), className = event.element.className, @@ -617,7 +618,20 @@ tinymce.PluginManager.add( 'wpview', function( editor ) { } }); - editor.on( 'resolvename', function( event ) { + editor.on( 'BeforeExecCommand', function( event ) { + var cmd = event.command, + view; + + if ( cmd === 'undo' || cmd === 'redo' || cmd === 'RemoveFormat' || cmd === 'mceToggleFormat' ) { + return; + } + + if ( view = getView( editor.selection.getNode() ) ) { + handleEnter( view ); + } + }); + + editor.on( 'ResolveName', function( event ) { if ( editor.dom.hasClass( event.target, 'wpview-wrap' ) ) { event.name = editor.dom.getAttrib( event.target, 'data-wpview-type' ) || 'wpview'; event.stopPropagation(); diff --git a/wp-includes/js/tinymce/plugins/wpview/plugin.min.js b/wp-includes/js/tinymce/plugins/wpview/plugin.min.js index 510663d39e..08ab720bca 100644 --- a/wp-includes/js/tinymce/plugins/wpview/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpview/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpview",function(a){function b(a){return c(a,"wpview-wrap")}function c(a,b){for(;a&&a.parentNode;){if(a.className&&-1!==(" "+a.className+" ").indexOf(" "+b+" "))return a;a=a.parentNode}return!1}function d(c){return(c=b(c))?window.decodeURIComponent(a.dom.getAttrib(c,"data-wpview-text")||""):""}function e(c,d){return c=b(c),c?(a.dom.setAttrib(c,"data-wpview-text",window.encodeURIComponent(d||"")),!0):!1}function f(a){a.stopPropagation()}function g(b,c){var d=b?"before":"after",e=b?0:1;j(),a.selection.setCursorLocation(a.dom.select(".wpview-selection-"+d,c)[0],e),a.nodeChanged()}function h(b,c,d){var e=a.dom,f=e.create("p");q.ie&&q.ie<11||(f.innerHTML='
'),c?b.parentNode.insertBefore(f,b):e.insertAfter(f,b),j(),c&&d===r.ENTER?g(c,b):a.selection.setCursorLocation(f,0),a.nodeChanged()}function i(b){var c,e=a.dom;b!==l&&(j(),l=b,e.setAttrib(b,"data-mce-selected",1),c=e.create("div",{"class":"wpview-clipboard",contenteditable:"true"},d(b)),a.dom.select(".wpview-body",b)[0].appendChild(c),e.bind(c,"beforedeactivate focusin focusout",f),e.bind(l,"beforedeactivate focusin focusout",f),a.getBody().focus(),a.selection.select(c,!0),a.nodeChanged())}function j(){var b,c=a.dom;l&&(b=a.dom.select(".wpview-clipboard",l)[0],c.unbind(b),c.remove(b),c.unbind(l,"beforedeactivate focusin focusout click mouseup",f),c.setAttrib(l,"data-mce-selected",null)),l=null}function k(a){return a.replace(/]+data-wpview-text=\"([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>(?: |\u00a0)*<\/p><\/div>/g,"$1")}var l,m,n,o,p,q=tinymce.Env,r=tinymce.util.VK,s=tinymce.dom.TreeWalker,t=!1,u=!0;if("undefined"!=typeof wp&&wp.mce)return a.on("BeforeAddUndo",function(a){a.lastLevel&&k(a.level.content)===k(a.lastLevel.content)&&a.preventDefault()}),a.on("BeforeSetContent",function(b){var c;b.content&&(b.initial||wp.mce.views.unbind(a),c=a.selection.getNode(),(!b.content.match(/^\s*(https?:\/\/[^\s"]+)\s*$/i)||"P"===c.nodeName&&c.parentNode===a.getBody()&&a.dom.isEmpty(c))&&(b.content=wp.mce.views.toViews(b.content)))}),a.on("SetContent",function(){wp.mce.views.render()}),a.on("click",function(c){var d,e=c.clientX,f=c.clientY,h=a.getBody(),i=h.getBoundingClientRect(),j=h.firstChild,k=j.getBoundingClientRect(),l=h.lastChild,m=l.getBoundingClientRect();fm.bottom&&(d=b(l))?(g(!1,d),c.preventDefault()):tinymce.each(a.dom.select(".wpview-wrap"),function(a){var b=a.getBoundingClientRect();return f>=b.top&&f<=b.bottom?void(ei.right&&(g(!1,a),c.preventDefault())):void 0})}),a.on("init",function(){var c=a.selection;a.on("BeforeSetContent",function(){var d,e,f=b(c.getNode());f&&(!f.nextSibling||b(f.nextSibling)?(e=a.getDoc().createTextNode(""),a.dom.insertAfter(e,f)):(d=new s(f.nextSibling,f.nextSibling),e=d.next()),c.select(e),c.collapse(!0))}),a.dom.bind(a.getBody().parentNode,"mousedown mouseup click",function(c){var d,e=b(c.target);return u=!1,e?(c.stopPropagation(),q.ie<=10&&j(),i(e),"click"!==c.type||c.metaKey||c.ctrlKey||(a.dom.hasClass(c.target,"edit")?wp.mce.views.edit(e):a.dom.hasClass(c.target,"remove")&&a.dom.remove(e)),!1):(d=q.ie&&q.ie<=8?"mouseup":"mousedown",void(c.type===d&&j()))})}),a.on("PreProcess",function(b){tinymce.each(a.dom.select("div[data-wpview-text]",b.node),function(a){a.textContent=a.innerText=" "})}),a.on("PostProcess",function(a){a.content&&(a.content=a.content.replace(/
]*?data-wpview-text="([^"]*)"[^>]*>[\s\S]*?<\/div>/g,function(a,b){return b?"

"+window.decodeURIComponent(b)+"

":""}))}),a.on("keydown",function(c){if(!(c.metaKey||c.ctrlKey||m>=112&&123>=m||l)){var d,e,f,j,k,m=c.keyCode,o=a.dom,p=a.selection,q=p.getNode(),s=b(q);n=q,p.isCollapsed()||(f=p.getRng(),(s=b(f.endContainer))?(j=f.cloneRange(),p.select(s.previousSibling,!0),p.collapse(),k=p.getRng(),j.setEnd(k.endContainer,k.endOffset),p.setRng(j)):(s=b(f.startContainer))&&(j=f.cloneRange(),j.setStart(s.nextSibling,0),p.setRng(j))),s&&((d=o.hasClass(s,"wpview-selection-before"))||(e=o.hasClass(s,"wpview-selection-after")))&&(e&&m===r.UP||d&&m===r.BACKSPACE?(s.previousSibling?b(s.previousSibling)?g(!1,s.previousSibling):o.isEmpty(s.previousSibling)&&m===r.BACKSPACE?o.remove(s.previousSibling):(p.select(s.previousSibling,!0),p.collapse()):g(!0,s),c.preventDefault()):!e||m!==r.DOWN&&m!==r.RIGHT?!d||m!==r.UP&&m!==r.LEFT?d&&m===r.DOWN?(s.nextSibling?b(s.nextSibling)?g(!0,s.nextSibling):p.setCursorLocation(s.nextSibling,0):g(!1,s),c.preventDefault()):e&&m===r.LEFT||d&&m===r.RIGHT?(i(s),c.preventDefault(),c.stopImmediatePropagation()):e&&m===r.BACKSPACE?(o.remove(s),c.preventDefault()):e?h(s):d&&h(s,!0,m):(s.previousSibling&&(b(s.previousSibling)?g(m===r.UP,s.previousSibling):(p.select(s.previousSibling,!0),p.collapse())),c.preventDefault()):(s.nextSibling&&(b(s.nextSibling)?g(m===r.RIGHT,s.nextSibling):p.setCursorLocation(s.nextSibling,0)),c.preventDefault()),m===r.ENTER&&c.preventDefault())}}),a.on("keydown",function(c){var d,e=a.dom,f=c.keyCode,i=a.selection;if(l){if(c.metaKey||c.ctrlKey||f>=112&&123>=f)return void(!c.metaKey&&!c.ctrlKey||88!==f&&f!==r.BACKSPACE||(88===f?t=l:a.dom.remove(l)));if(d=b(i.getNode()),d!==l)return void j();f===r.LEFT?g(!0,d):f===r.UP?d.previousSibling?b(d.previousSibling)?g(!0,d.previousSibling):(j(),i.select(d.previousSibling,!0),i.collapse()):g(!0,d):f===r.RIGHT?g(!1,d):f===r.DOWN?d.nextSibling?b(d.nextSibling)?g(!1,d.nextSibling):(j(),i.setCursorLocation(d.nextSibling,0)):g(!1,d):f===r.ENTER?h(d):(f===r.DELETE||f===r.BACKSPACE)&&e.remove(l),c.preventDefault()}}),a.on("keydown",function(c){var d,e,f,h=a.selection;c.keyCode===r.BACKSPACE&&(d=h.getNode(),a.dom.isEmpty(d)?(f=b(d.previousSibling))&&(g(!1,f),a.dom.remove(d),c.preventDefault()):(e=h.getRng())&&0===e.startOffset&&0===e.endOffset&&(f=b(d.previousSibling))&&(g(!1,f),c.preventDefault()))}),a.on("keyup",function(){t&&(a.dom.remove(t),t=!1)}),a.on("focus",function(){var c;p=!0,a.dom.addClass(a.getBody(),"has-focus"),u&&(c=b(a.getBody().firstChild))&&g(!0,c),u=!1}),a.on("blur",function(){p=!1,a.dom.removeClass(a.getBody(),"has-focus")}),a.on("nodechange",function(d){var e=a.dom,f=a.dom.select(".wpview-wrap"),h=d.element.className,i=b(d.element),k=n;if(n=!1,clearInterval(m),e.removeClass(f,"wpview-selection-before"),e.removeClass(f,"wpview-selection-after"),e.removeClass(f,"wpview-cursor-hide"),p)if(i)if("wpview-selection-before"===h||"wpview-selection-after"===h&&a.selection.isCollapsed()){if(o=0,j(),k===i.previousSibling)return void g(!0,i);if(k===i.nextSibling)return void g(!1,i);e.addClass(i,h),m=setInterval(function(){e.hasClass(i,"wpview-cursor-hide")?e.removeClass(i,"wpview-cursor-hide"):e.addClass(i,"wpview-cursor-hide")},500)}else c(d.element,"wpview-clipboard")||o||(j(),o++,g(!0,i));else j()}),a.on("resolvename",function(c){a.dom.hasClass(c.target,"wpview-wrap")?(c.name=a.dom.getAttrib(c.target,"data-wpview-type")||"wpview",c.stopPropagation()):b(c.target)&&(c.preventDefault(),c.stopPropagation())}),{getViewText:d,setViewText:e,getView:b}}); \ No newline at end of file +tinymce.PluginManager.add("wpview",function(a){function b(a){return c(a,"wpview-wrap")}function c(a,b){for(;a&&a.parentNode;){if(a.className&&-1!==(" "+a.className+" ").indexOf(" "+b+" "))return a;a=a.parentNode}return!1}function d(c){return(c=b(c))?window.decodeURIComponent(a.dom.getAttrib(c,"data-wpview-text")||""):""}function e(c,d){return c=b(c),c?(a.dom.setAttrib(c,"data-wpview-text",window.encodeURIComponent(d||"")),!0):!1}function f(a){a.stopPropagation()}function g(b,c){var d=b?"before":"after",e=b?0:1;j(),a.selection.setCursorLocation(a.dom.select(".wpview-selection-"+d,c)[0],e),a.nodeChanged()}function h(b,c,d){var e=a.dom,f=e.create("p");q.ie&&q.ie<11||(f.innerHTML='
'),c?b.parentNode.insertBefore(f,b):e.insertAfter(f,b),j(),c&&d===r.ENTER?g(c,b):a.selection.setCursorLocation(f,0),a.nodeChanged()}function i(b){var c,e=a.dom;b!==l&&(j(),l=b,e.setAttrib(b,"data-mce-selected",1),c=e.create("div",{"class":"wpview-clipboard",contenteditable:"true"},d(b)),a.dom.select(".wpview-body",b)[0].appendChild(c),e.bind(c,"beforedeactivate focusin focusout",f),e.bind(l,"beforedeactivate focusin focusout",f),a.getBody().focus(),a.selection.select(c,!0),a.nodeChanged())}function j(){var b,c=a.dom;l&&(b=a.dom.select(".wpview-clipboard",l)[0],c.unbind(b),c.remove(b),c.unbind(l,"beforedeactivate focusin focusout click mouseup",f),c.setAttrib(l,"data-mce-selected",null)),l=null}function k(a){return a.replace(/]+data-wpview-text=\"([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>(?: |\u00a0)*<\/p><\/div>/g,"$1")}var l,m,n,o,p,q=tinymce.Env,r=tinymce.util.VK,s=tinymce.dom.TreeWalker,t=!1,u=!0;if("undefined"!=typeof wp&&wp.mce)return a.on("BeforeAddUndo",function(a){a.lastLevel&&k(a.level.content)===k(a.lastLevel.content)&&a.preventDefault()}),a.on("BeforeSetContent",function(b){var c;b.content&&(b.initial||wp.mce.views.unbind(a),c=a.selection.getNode(),(!b.content.match(/^\s*(https?:\/\/[^\s"]+)\s*$/i)||"P"===c.nodeName&&c.parentNode===a.getBody()&&a.dom.isEmpty(c))&&(b.content=wp.mce.views.toViews(b.content)))}),a.on("SetContent",function(){wp.mce.views.render()}),a.on("click",function(c){var d,e=c.clientX,f=c.clientY,h=a.getBody(),i=h.getBoundingClientRect(),j=h.firstChild,k=j.getBoundingClientRect(),l=h.lastChild,m=l.getBoundingClientRect();fm.bottom&&(d=b(l))?(g(!1,d),c.preventDefault()):tinymce.each(a.dom.select(".wpview-wrap"),function(a){var b=a.getBoundingClientRect();return f>=b.top&&f<=b.bottom?void(ei.right&&(g(!1,a),c.preventDefault())):void 0})}),a.on("init",function(){var c=a.selection;a.on("BeforeSetContent",function(){var d,e,f=b(c.getNode());f&&(!f.nextSibling||b(f.nextSibling)?(e=a.getDoc().createTextNode(""),a.dom.insertAfter(e,f)):(d=new s(f.nextSibling,f.nextSibling),e=d.next()),c.select(e),c.collapse(!0))}),a.dom.bind(a.getBody().parentNode,"mousedown mouseup click",function(c){var d,e=b(c.target);return u=!1,e?(c.stopPropagation(),q.ie<=10&&j(),i(e),"click"!==c.type||c.metaKey||c.ctrlKey||(a.dom.hasClass(c.target,"edit")?wp.mce.views.edit(e):a.dom.hasClass(c.target,"remove")&&a.dom.remove(e)),!1):(d=q.ie&&q.ie<=8?"mouseup":"mousedown",void(c.type===d&&j()))})}),a.on("PreProcess",function(b){tinymce.each(a.dom.select("div[data-wpview-text]",b.node),function(a){a.textContent=a.innerText=" "})}),a.on("PostProcess",function(a){a.content&&(a.content=a.content.replace(/
]*?data-wpview-text="([^"]*)"[^>]*>[\s\S]*?<\/div>/g,function(a,b){return b?"

"+window.decodeURIComponent(b)+"

":""}))}),a.on("keydown",function(c){if(!(c.metaKey||c.ctrlKey||m>=112&&123>=m||l)){var d,e,f,j,k,m=c.keyCode,o=a.dom,p=a.selection,q=p.getNode(),s=b(q);n=q,p.isCollapsed()||(f=p.getRng(),(s=b(f.endContainer))?(j=f.cloneRange(),p.select(s.previousSibling,!0),p.collapse(),k=p.getRng(),j.setEnd(k.endContainer,k.endOffset),p.setRng(j)):(s=b(f.startContainer))&&(j=f.cloneRange(),j.setStart(s.nextSibling,0),p.setRng(j))),s&&((d=o.hasClass(s,"wpview-selection-before"))||(e=o.hasClass(s,"wpview-selection-after")))&&(e&&m===r.UP||d&&m===r.BACKSPACE?(s.previousSibling?b(s.previousSibling)?g(!1,s.previousSibling):o.isEmpty(s.previousSibling)&&m===r.BACKSPACE?o.remove(s.previousSibling):(p.select(s.previousSibling,!0),p.collapse()):g(!0,s),c.preventDefault()):!e||m!==r.DOWN&&m!==r.RIGHT?!d||m!==r.UP&&m!==r.LEFT?d&&m===r.DOWN?(s.nextSibling?b(s.nextSibling)?g(!0,s.nextSibling):p.setCursorLocation(s.nextSibling,0):g(!1,s),c.preventDefault()):e&&m===r.LEFT||d&&m===r.RIGHT?(i(s),c.preventDefault(),c.stopImmediatePropagation()):e&&m===r.BACKSPACE?(o.remove(s),c.preventDefault()):e?h(s):d&&h(s,!0,m):(s.previousSibling&&(b(s.previousSibling)?g(m===r.UP,s.previousSibling):(p.select(s.previousSibling,!0),p.collapse())),c.preventDefault()):(s.nextSibling&&(b(s.nextSibling)?g(m===r.RIGHT,s.nextSibling):p.setCursorLocation(s.nextSibling,0)),c.preventDefault()),m===r.ENTER&&c.preventDefault())}}),a.on("keydown",function(c){var d,e=a.dom,f=c.keyCode,i=a.selection;if(l){if(c.metaKey||c.ctrlKey||f>=112&&123>=f)return void(!c.metaKey&&!c.ctrlKey||88!==f&&f!==r.BACKSPACE||(88===f?t=l:a.dom.remove(l)));if(d=b(i.getNode()),d!==l)return void j();f===r.LEFT?g(!0,d):f===r.UP?d.previousSibling?b(d.previousSibling)?g(!0,d.previousSibling):(j(),i.select(d.previousSibling,!0),i.collapse()):g(!0,d):f===r.RIGHT?g(!1,d):f===r.DOWN?d.nextSibling?b(d.nextSibling)?g(!1,d.nextSibling):(j(),i.setCursorLocation(d.nextSibling,0)):g(!1,d):f===r.ENTER?h(d):(f===r.DELETE||f===r.BACKSPACE)&&e.remove(l),c.preventDefault()}}),a.on("keydown",function(c){var d,e,f,h=a.selection;c.keyCode===r.BACKSPACE&&(d=h.getNode(),a.dom.isEmpty(d)?(f=b(d.previousSibling))&&(g(!1,f),a.dom.remove(d),c.preventDefault()):(e=h.getRng())&&0===e.startOffset&&0===e.endOffset&&(f=b(d.previousSibling))&&(g(!1,f),c.preventDefault()))}),a.on("keyup",function(){t&&(a.dom.remove(t),t=!1)}),a.on("focus",function(){var c;p=!0,a.dom.addClass(a.getBody(),"has-focus"),u&&(c=b(a.getBody().firstChild))&&g(!0,c),u=!1}),a.on("blur",function(){p=!1,a.dom.removeClass(a.getBody(),"has-focus")}),a.on("NodeChange",function(d){var e=a.dom,f=a.dom.select(".wpview-wrap"),h=d.element.className,i=b(d.element),k=n;if(n=!1,clearInterval(m),e.removeClass(f,"wpview-selection-before"),e.removeClass(f,"wpview-selection-after"),e.removeClass(f,"wpview-cursor-hide"),p)if(i)if("wpview-selection-before"===h||"wpview-selection-after"===h&&a.selection.isCollapsed()){if(o=0,j(),k===i.previousSibling)return void g(!0,i);if(k===i.nextSibling)return void g(!1,i);e.addClass(i,h),m=setInterval(function(){e.hasClass(i,"wpview-cursor-hide")?e.removeClass(i,"wpview-cursor-hide"):e.addClass(i,"wpview-cursor-hide")},500)}else c(d.element,"wpview-clipboard")||o||(j(),o++,g(!0,i));else j()}),a.on("BeforeExecCommand",function(c){var d,e=c.command;"undo"!==e&&"redo"!==e&&"RemoveFormat"!==e&&"mceToggleFormat"!==e&&(d=b(a.selection.getNode()))&&h(d)}),a.on("ResolveName",function(c){a.dom.hasClass(c.target,"wpview-wrap")?(c.name=a.dom.getAttrib(c.target,"data-wpview-type")||"wpview",c.stopPropagation()):b(c.target)&&(c.preventDefault(),c.stopPropagation())}),{getViewText:d,setViewText:e,getView:b}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index e9091ab8be0707276cd00a72685fb07d1e0fc763..7272d1d3d3b165a9f1e35e67b97f20a940001c12 100644 GIT binary patch delta 2236 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 BM;ibD diff --git a/wp-includes/version.php b/wp-includes/version.php index 206256992d..deccd6e96f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.0-beta1-20140715'; +$wp_version = '4.0-beta1-20140716'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.