core/assets/vendor/ckeditor/CHANGES.md | 4 + core/assets/vendor/ckeditor/build-config.js | 15 +- core/assets/vendor/ckeditor/ckeditor.js | 1679 ++++++++++---------- core/assets/vendor/ckeditor/skins/moono/editor.css | 2 +- .../vendor/ckeditor/skins/moono/editor_gecko.css | 2 +- .../vendor/ckeditor/skins/moono/editor_ie.css | 2 +- .../vendor/ckeditor/skins/moono/editor_ie7.css | 2 +- .../vendor/ckeditor/skins/moono/editor_ie8.css | 2 +- .../ckeditor/skins/moono/editor_iequirks.css | 2 +- core/modules/ckeditor/ckeditor.module | 35 +- .../ckeditor/js/plugins/drupalimage/plugin.js | 114 +- .../js/plugins/drupalimagecaption/plugin.js | 262 +++ .../js/plugins/drupalimagecaption/theme.js | 214 +++ .../Plugin/CKEditorPlugin/DrupalImageCaption.php | 90 ++ .../lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php | 2 +- .../ckeditor/Tests/CKEditorPluginManagerTest.php | 4 +- .../lib/Drupal/editor/Form/EditorImageDialog.php | 85 +- core/modules/filter/css/filter.caption.css | 11 + core/modules/system/css/system.theme.css | 6 + core/themes/bartik/bartik.info.yml | 2 + core/themes/bartik/css/ckeditor-iframe.css | 35 + 21 files changed, 1664 insertions(+), 906 deletions(-) diff --git a/core/assets/vendor/ckeditor/CHANGES.md b/core/assets/vendor/ckeditor/CHANGES.md index 7e892ab..2ff3ced 100644 --- a/core/assets/vendor/ckeditor/CHANGES.md +++ b/core/assets/vendor/ckeditor/CHANGES.md @@ -1,6 +1,10 @@ CKEditor 4 Changelog ==================== +## CKEditor 4.3 + +## CKEditor 4.2.1 + ## CKEditor 4.2 **Important Notes:** diff --git a/core/assets/vendor/ckeditor/build-config.js b/core/assets/vendor/ckeditor/build-config.js index 87a02ba..7d99e38 100644 --- a/core/assets/vendor/ckeditor/build-config.js +++ b/core/assets/vendor/ckeditor/build-config.js @@ -1,4 +1,4 @@ -/** +/** * This is a Drupal-optimized build of CKEditor. * * You may re-use it at any time at http://ckeditor.com/builder to build @@ -25,7 +25,7 @@ var CKBUILDER_CONFIG = { 'contents.css', 'styles.js', 'samples', - 'skins/moono/readme.md', + 'skins/moono/readme.md' ], plugins : { 'about' : 1, @@ -65,14 +65,7 @@ var CKBUILDER_CONFIG = { 'showborders' : 1, 'tableresize' : 1, 'sharedspace' : 1, - 'sourcedialog' : 1 - // @todo D8: CKEditor Widgets is not available in 4.1 RC, and we're not yet - // using this, so it's commented out for now. However, it will be readded in - // the nearby future. - // 'widget' : 1, - // 'widgetblockquote' : 1, - // 'widgetcaption' : 1, - // 'widgettime' : 1, - // 'widgetvideo' : 1 + 'sourcedialog' : 1, + 'widget' : 1 } }; diff --git a/core/assets/vendor/ckeditor/ckeditor.js b/core/assets/vendor/ckeditor/ckeditor.js index 9ea15fe..03b4f88 100644 --- a/core/assets/vendor/ckeditor/ckeditor.js +++ b/core/assets/vendor/ckeditor/ckeditor.js @@ -2,831 +2,872 @@ Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ -(function(){if(!window.CKEDITOR||!window.CKEDITOR.dom)window.CKEDITOR||(window.CKEDITOR=function(){var b={timestamp:"D6JD",version:"4.2 DEV",revision:"0",rnd:Math.floor(900*Math.random())+100,_:{pending:[]},status:"unloaded",basePath:function(){var c=window.CKEDITOR_BASEPATH||"";if(!c)for(var a=document.getElementsByTagName("script"),b=0;b=0;n--)if(l[n].priority<=i){l.splice(n+1,0,g);return{removeListener:e}}l.unshift(g)}return{removeListener:e}},once:function(){var c=arguments[1];arguments[1]=function(a){a.removeListener();return c.apply(this,arguments)};return this.on.apply(this, -arguments)},capture:function(){CKEDITOR.event.useCapture=1;var c=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return c},fire:function(){var c=0,a=function(){c=1},b=0,h=function(){b=1};return function(i,g,j){var l=e(this)[i],i=c,m=b;c=b=0;if(l){var n=l.listeners;if(n.length)for(var n=n.slice(0),p,k=0;k=0&&d.listeners.splice(h,1)}},removeAllListeners:function(){var a=e(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=e(this)[a])&&a.listeners.length>0}}}()),CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire= -function(b,e){b in{instanceReady:1,loaded:1}&&(this[b]=true);return CKEDITOR.event.prototype.fire.call(this,b,e,this)},CKEDITOR.editor.prototype.fireOnce=function(b,e){b in{instanceReady:1,loaded:1}&&(this[b]=true);return CKEDITOR.event.prototype.fireOnce.call(this,b,e,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype)),CKEDITOR.env||(CKEDITOR.env=function(){var b=navigator.userAgent.toLowerCase(),e=window.opera,a={ie:eval("/*@cc_on!@*/false"),opera:!!e&&e.version,webkit:b.indexOf(" applewebkit/")> --1,air:b.indexOf(" adobeair/")>-1,mac:b.indexOf("macintosh")>-1,quirks:document.compatMode=="BackCompat",mobile:b.indexOf("mobile")>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var a=document.domain,c=window.location.hostname;return a!=c&&a!="["+c+"]"},secure:location.protocol=="https:"};a.gecko=navigator.product=="Gecko"&&!a.webkit&&!a.opera;if(a.webkit)b.indexOf("chrome")>-1?a.chrome=true:a.safari=true;var c=0;if(a.ie){c=a.quirks||!document.documentMode? -parseFloat(b.match(/msie (\d+)/)[1]):document.documentMode;a.ie9Compat=c==9;a.ie8Compat=c==8;a.ie7Compat=c==7;a.ie6Compat=c<7||a.quirks}if(a.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split(".");c=f[0]*1E4+(f[1]||0)*100+(f[2]||0)*1}}a.opera&&(c=parseFloat(e.version()));a.air&&(c=parseFloat(b.match(/ adobeair\/(\d+)/)[1]));a.webkit&&(c=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]));a.version=c;a.isCompatible=a.iOS&&c>=534||!a.mobile&&(a.ie&&c>6||a.gecko&&c>=10801||a.opera&&c>=9.5||a.air&&c>= -1||a.webkit&&c>=522||false);a.hidpi=window.devicePixelRatio>=2;a.cssClass="cke_browser_"+(a.ie?"ie":a.gecko?"gecko":a.opera?"opera":a.webkit?"webkit":"unknown");if(a.quirks)a.cssClass=a.cssClass+" cke_browser_quirks";if(a.ie){a.cssClass=a.cssClass+(" cke_browser_ie"+(a.quirks||a.version<7?"6":a.version));if(a.quirks)a.cssClass=a.cssClass+" cke_browser_iequirks"}if(a.gecko)if(c<10900)a.cssClass=a.cssClass+" cke_browser_gecko18";else if(c<=11E3)a.cssClass=a.cssClass+" cke_browser_gecko19";if(a.air)a.cssClass= -a.cssClass+" cke_browser_air";if(a.iOS)a.cssClass=a.cssClass+" cke_browser_ios";if(a.hidpi)a.cssClass=a.cssClass+" cke_hidpi";return a}()),"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);CKEDITOR.loadFullCore=function(){if(CKEDITOR.status!="basic_ready")CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var b=document.createElement("script");b.type="text/javascript";b.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(b)}}; -CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(b){(this._.pending||(this._.pending=[])).push(b)};(function(){CKEDITOR.domReady(function(){var b=CKEDITOR.loadFullCore,e=CKEDITOR.loadFullCoreTimeout;if(b){CKEDITOR.status="basic_ready";b&&b._load?b():e&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},e*1E3)}})})();CKEDITOR.status="basic_loaded"}(),CKEDITOR.dom={},function(){var b=[],e=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.opera?"-o-":CKEDITOR.env.ie? -"-ms-":"";CKEDITOR.on("reset",function(){b=[]});CKEDITOR.tools={arrayCompare:function(a,c){if(!a&&!c)return true;if(!a||!c||a.length!=c.length)return false;for(var b=0;b"+c+""):b.push('');return b.join("")},htmlEncode:function(a){return(""+a).replace(/&/g,"&").replace(/>/g,">").replace(//g,">")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+ -this.getNextNumber()},override:function(a,c){var b=c(a);b.prototype=a.prototype;return b},setTimeout:function(a,c,b,d,h){h||(h=window);b||(b=h);return h.setTimeout(function(){d?a.apply(b,[].concat(d)):a.apply(b)},c||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(c){return c.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(c){return c.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(c){return c.replace(a,"")}}(),indexOf:function(a, -c){if(typeof c=="function")for(var b=0,d=a.length;b=0?a[b]:null},bind:function(a,c){return function(){return a.apply(c,arguments)}},createClass:function(a){var c=a.$,b=a.base,d=a.privates||a._,h=a.proto,a=a.statics;!c&&(c=function(){b&&this.base.apply(this,arguments)});if(d)var i=c,c=function(){var a=this._||(this._= -{}),c;for(c in d){var b=d[c];a[c]=typeof b=="function"?CKEDITOR.tools.bind(b,this):b}i.apply(this,arguments)};if(b){c.prototype=this.prototypedCopy(b.prototype);c.prototype.constructor=c;c.base=b;c.baseProto=b.prototype;c.prototype.base=function(){this.base=b.prototype.base;b.apply(this,arguments);this.base=arguments.callee}}h&&this.extend(c.prototype,h,true);a&&this.extend(c,a,true);return c},addFunction:function(a,c){return b.push(function(){return a.apply(c||this,arguments)})-1},removeFunction:function(a){b[a]= -null},callFunction:function(a){var c=b[a];return c&&c.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,c;return function(b){c=CKEDITOR.tools.trim(b+"")+"px";return a.test(c)?c:b||""}}(),convertToPx:function(){var a;return function(c){if(!a){a=CKEDITOR.dom.element.createFromHtml('
',CKEDITOR.document);CKEDITOR.document.getBody().append(a)}if(!/%$/.test(c)){a.setStyle("width", -c);return a.$.clientWidth}return c}}(),repeat:function(a,c){return Array(c+1).join(a)},tryThese:function(){for(var a,c=0,b=arguments.length;c8)&&e)b=e+":"+b;return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(b))},getHead:function(){var b=this.$.getElementsByTagName("head")[0];return b=b?new CKEDITOR.dom.element(b):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),true)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)}, -getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(b){this.$.open("text/html","replace");CKEDITOR.env.ie&&(b=b.replace(/(?:^\s*]*?>)|^/i,'$&\n