Index: /CKEditor/branches/versions/3.5.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 6177) +++ /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 6178) @@ -40,4 +40,5 @@ New features:

#4090 : Full Adobe AIR support.
#5755 : Introduced the dialog_buttonsOrder setting, making it possible to control the buttons order.
#4648 : Added the new Iframe plugin.

+ com.ckeditor.air.sample + CKEditor - Adobe AIR Sample Application + 1.0 + CKEditor AIR Samples + This is a sample AIR application of CKEditor. + Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. + + _samples/skins.html + CKEditor - Adobe AIR Sample + standard + false + true + true + true + true + 100 + 80 + 950 + 700 + 900 600 + + CKEditor/Sample AIR Application + CKEditor/Sample AIR Application + false + false +

Replace Textarea by Code - CKEditor Sample

+ CKEditor - Adobe AIR Sample +

+ This is a sample HTML/JavaScript Adobe AIR application with CKEditor with default features. +

+ <p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p> + +

=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})(); +// if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',rev:'%REV%',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})(); // #### Raw code @@ -127,5 +127,5 @@ // In IE (only) the script.src string is the raw valued entered in the // HTML. Other browsers return the full resolved URL instead. - if ( path.indexOf('://') == -1 ) + if ( path.indexOf(':/') == -1 ) { // Absolute path. @@ -169,5 +169,5 @@ { // If this is not a full or absolute path. - if ( resource.indexOf('://') == -1 && resource.indexOf( '/' ) !== 0 ) + if ( resource.indexOf(':/') == -1 && resource.indexOf( '/' ) !== 0 ) resource = this.basePath + resource; Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/document.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/document.js (revision 6177) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/document.js (revision 6178) @@ -166,4 +166,7 @@ { var head = this.$.getElementsByTagName( 'head' )[0]; + if ( !head ) + head = this.getDocumentElement().append( new CKEDITOR.dom.element( 'head' ), true ); + else head = new CKEDITOR.dom.element( head ); @@ -221,4 +224,28 @@ return win; })(); + }, + + /** + * Defines the document contents through document.write. Note that the + * previous document contents will be lost (cleaned). + * @since 3.5 + * @param {String} html The HTML defining the document contents. + * @example + * document.write( + * '<html>' + + * '<head><title>Sample Doc</title></head>' + + * '<body>Document contents created by code</body>' + + * '</html>' ); + */ + write : function( html ) + { + // Don't leave any history log in IE. (#5657) + this.$.open( 'text/html', 'replace' ); + + // Support for custom document.domain in IE. + CKEDITOR.env.isCustomDomain() && ( this.$.domain = document.domain ); + + this.$.write( html ); + this.$.close(); } }); Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/element.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/element.js (revision 6177) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/element.js (revision 6178) @@ -308,10 +308,14 @@ /** * Moves the selection focus to this element. + * @param {Boolean} defer Whether to asynchronously defer the + * execution by 100 ms. * @example * var element = CKEDITOR.document.getById( 'myTextarea' ); * element.focus(); */ - focus : function() - { + focus : (function() + { + function exec() + { // IE throws error if the element is not visible. try @@ -321,5 +325,14 @@ catch (e) {} - }, + } + + return function( defer ) + { + if ( defer ) + CKEDITOR.tools.setTimeout( exec, 100, this ); + else + exec.call( this ); + } + }()), /** Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/node.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/node.js (revision 6177) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/node.js (revision 6178) @@ -245,11 +245,5 @@ getDocument : function() { - var document = new CKEDITOR.dom.document( this.$.ownerDocument || this.$.parentNode.ownerDocument ); - - return ( - this.getDocument = function() - { - return document; - })(); + return new CKEDITOR.dom.document( this.$.ownerDocument || this.$.parentNode.ownerDocument ); }, Index: /CKEditor/branches/versions/3.5.x/_source/core/editor.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/editor.js (revision 6177) +++ /CKEditor/branches/versions/3.5.x/_source/core/editor.js (revision 6178) @@ -228,4 +228,7 @@ } + // Load the Adobe AIR plugin conditionally. + CKEDITOR.env.air && ( plugins += ',adobeair' ); + // Load all plugins defined in the "plugins" setting. CKEDITOR.plugins.load( plugins.split( ',' ), function( plugins ) Index: /CKEditor/branches/versions/3.5.x/_source/core/tools.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/tools.js (revision 6177) +++ /CKEditor/branches/versions/3.5.x/_source/core/tools.js (revision 6178) @@ -639,5 +639,5 @@ return functions.push( function() { - fn.apply( scope || this, arguments ); + return fn.apply( scope || this, arguments ); }) - 1; }, Index: /CKEditor/branches/versions/3.5.x/_source/core/ui.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/ui.js (revision 6177) +++ /CKEditor/branches/versions/3.5.x/_source/core/ui.js (revision 6178) @@ -92,4 +92,6 @@ }; +CKEDITOR.event.implementOn( CKEDITOR.ui ); + /** * (Virtual Class) Do not call this constructor. This class is not really part Index: /CKEditor/branches/versions/3.5.x/_source/plugins/adobeair/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/adobeair/plugin.js (revision 6178) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/adobeair/plugin.js (revision 6178) @@ -0,0 +1,227 @@ +/* +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +(function() +{ + var eventNameList = [ 'click', 'keydown', 'mousedown', 'keypress' ]; + + // Inline event callbacks assigned via innerHTML/outerHTML, such as + // onclick/onmouseover, are ignored in AIR. + // Use DOM2 event listeners to substitue inline handlers instead. + function convertInlineHandlers( container ) + { + // TODO: document.querySelectorAll is not supported in AIR. + var children = container.getElementsByTag( '*' ), + count = children.count(), + child; + + for ( var i = 0; i < count; i++ ) + { + child = children.getItem( i ); + + (function( node ) + { + for ( var j = 0; j < eventNameList.length; j++ ) + { + (function( eventName ) + { + if ( node.hasAttribute( 'on' + eventName ) ) + { + node.on( eventName, function( evt ) + { + var inlineEventHandler = node.getAttribute( 'on' + eventName ), + callFunc = /(return\s*)?CKEDITOR\.tools\.callFunction$([^)]+)$/.exec( inlineEventHandler ), + hasReturn = callFunc && callFunc[ 1 ], + callFuncArgs = callFunc && callFunc[ 2 ].split( ',' ), + preventDefault = /return false;/.test( inlineEventHandler ); + + if ( callFuncArgs ) + { + var nums = callFuncArgs.length, + argName; + + for ( var i = 0; i < nums; i++ ) + { + // Trim spaces around param. + callFuncArgs[ i ] = argName = CKEDITOR.tools.trim( callFuncArgs[ i ] ); + + // String form param. + var strPattern = argName.match( /^(["'])([^"']*?)\1$/ ); + if ( strPattern ) + { + callFuncArgs[ i ] = strPattern[ 2 ]; + continue; + } + + // Integer form param. + if ( argName.match( /\d+/ ) ) + { + callFuncArgs[ i ] = parseInt( argName, 10 ); + continue; + } + + // Speical variables. + switch( argName ) + { + case 'this' : + callFuncArgs[ i ] = node.$; + break; + case 'event' : + callFuncArgs[ i ] = evt.data.$; + break; + case 'null' : + callFuncArgs [ i ] = null; + break; + } + } + + var retval = CKEDITOR.tools.callFunction.apply( window, callFuncArgs ); + if ( hasReturn && retval === false ) + preventDefault = 1; + } + + if ( preventDefault ) + evt.data.preventDefault(); + }); + } + })( eventNameList[ j ] ); + } + })( child ); + } + } + + CKEDITOR.plugins.add( 'adobeair', + { + init : function( editor ) + { + if ( !CKEDITOR.env.air ) + return; + + // Body doesn't get default margin on AIR. + editor.addCss( 'body { padding: 8px }' ); + + editor.on( 'uiReady', function() + { + convertInlineHandlers( editor.container ); + + if ( editor.sharedSpaces ) + { + for ( var space in editor.sharedSpaces ) + convertInlineHandlers( editor.sharedSpaces[ space ] ); + } + + editor.on( 'elementsPathUpdate', function( evt ) { convertInlineHandlers( evt.data.space ); } ); + }); + + editor.on( 'contentDom', function() + { + // Hyperlinks are enabled in editable documents in Adobe + // AIR. Prevent their click behavior. + editor.document.on( 'click', function( ev ) + { + ev.data.preventDefault( true ); + }); + }); + } + }); + + CKEDITOR.ui.on( 'ready', function( evt ) + { + var ui = evt.data; + // richcombo, panelbutton and menu + if ( ui._.panel ) + { + var panel = ui._.panel._.panel, + holder; + + ( function() + { + // Adding dom event listeners off-line are not supported in AIR, + // waiting for panel iframe loaded. + if ( !panel.isLoaded ) + { + setTimeout( arguments.callee, 30 ); + return; + } + holder = panel._.holder; + convertInlineHandlers( holder ); + })(); + } + else if ( ui instanceof CKEDITOR.dialog ) + convertInlineHandlers( ui._.element ); + }); +})(); + +CKEDITOR.dom.document.prototype.write = CKEDITOR.tools.override( CKEDITOR.dom.document.prototype.write, + function( original_write ) + { + function appendElement( parent, tagName, fullTag, text ) + { + var node = parent.append( tagName ), + attrs = CKEDITOR.htmlParser.fragment.fromHtml( fullTag ).children[ 0 ].attributes; + attrs && node.setAttributes( attrs ); + text && node.append( parent.getDocument().createText( text ) ); + } + + return function( html, mode ) + { + // document.write() or document.writeln() fail silently after + // the page load event in Adobe AIR. + // DOM manipulation could be used instead. + if ( this.getBody() ) + { + // We're taking the below extra work only because innerHTML + // on element doesn't work as expected. + var doc = this, + head = this.getHead(); + + // Create style nodes for inline css. (