Index: /CKEditor/branches/features/adobeair/CHANGES.html =================================================================== --- /CKEditor/branches/features/adobeair/CHANGES.html (revision 6005) +++ /CKEditor/branches/features/adobeair/CHANGES.html (revision 6006) @@ -36,14 +36,241 @@

- CKEditor 3.3.2 (SVN)

+ CKEditor 3.4.2 (SVN)

New features:

Fixed issues:

+

+ CKEditor 3.4.1

+

+ New features:

+ +

+ Fixed issues:

+ +

+ CKEditor 3.4

+

+ Fixed issues:

+ +

+ CKEditor 3.4 Beta

+

+ New features:

+ +

+ Fixed issues:

+ +

+ CKEditor 3.3.2

+

+ New features:

+ +

+ Fixed issues:

+

@@ -52,18 +279,18 @@ Fixed issues:

@@ -72,10 +299,10 @@ New features:

@@ -85,74 +312,74 @@

Fixed issues:

@@ -162,101 +389,101 @@ New features:

Fixed issues:

@@ -267,20 +494,20 @@ +
  • #4973 : The Style field in the Div Container dialog is now loading the styles defined in the default styleset used by the Styles toolbar combo.

    • Fixed issues:

    @@ -289,71 +516,71 @@ New features:

    Fixed issues:

    @@ -363,44 +590,44 @@ New features:

    Fixed issues:

    @@ -409,72 +636,72 @@ New features:

    Fixed issues:

    @@ -484,61 +711,61 @@ New features:

    Fixed issues:

    @@ -548,202 +775,202 @@ New features:

    Fixed issues:

    +
  • #3984 : [IE]The pre-formatted style is generating error.
    • +
  • #3946 : Fixed unable to hide contextmenu.
    • +
  • #3956 : Fixed About dialog in Source Mode for IE.
    • +
  • #3953 : Fixed keystroke for close Paste dialog.
    • +
  • #3951 : Reset size and lock ratio options were not accessible in Image dialog.
    • +
  • #3921 : Fixed Container scroll issue on IE7.
    • +
  • #3940 : Fixed list operation doesn't stop at table.
    • +
  • #3891 : [IE] Fixed 'automatic' font color doesn't work.
    • +
  • #3972 : Fixed unable to remove a single empty list in document in Firefox with enterMode=BR.
    • +
  • #3973 : Fixed list creation error at the end of document.
    • +
  • #3959 : Pasting styled text from word result in content lost.
    • +
  • #3793 : Combined images into sprites.
    • +
  • #3783 : Fixed indenting command in table cells create collapsed paragraph.
    • +
  • #3968 : About dialog layout was broken with IE+Standards+RTL.
    • +
  • #3991 : In IE quirks, text was not visible in v2 and office2003 skins.
    • +
  • #3983 : In IE, we'll now silently ignore wrong toolbar definition settings which have extra commas being left around.
  • Fixed the following test cases:
    • -
  • #3989 : Host page horizontal scrolling a lot when on having righ-to-left direction.
    • -
  • #4001 : Create link around existing image result incorrect.
    • -
  • #3988 : Destroy editor on form submit event cause error.
    • -
  • #3994 : Insert horizontal line at end of document cause error.
    • -
  • #4074 : Indent error with 'indentClasses' config specified.
    • -
  • #4057 : Fixed anchor is lost after switch between editing modes.
    • -
  • #3644 : Image dialog was missin radio lock.
    • -
  • #4014 : Firefox2 had no dialog button backgrounds.
    • -
  • #4018 : Firefox2 had no richcombo text visible.
    • -
  • #4035 : [IE6] Paste dialog size was too small.
    • -
  • #4049 : Kama skin was too wide with config.width.
    • +
  • #3992 : core/ckeditor2.html
    • +
  • #4138 : core/plugins.html
    • +
  • #3801 : plugins/htmldataprocessor/htmldataprocessor.html
    • + +
  • #3989 : Host page horizontal scrolling a lot when on having righ-to-left direction.
    • +
  • #4001 : Create link around existing image result incorrect.
    • +
  • #3988 : Destroy editor on form submit event cause error.
    • +
  • #3994 : Insert horizontal line at end of document cause error.
    • +
  • #4074 : Indent error with 'indentClasses' config specified.
    • +
  • #4057 : Fixed anchor is lost after switch between editing modes.
    • +
  • #3644 : Image dialog was missin radio lock.
    • +
  • #4014 : Firefox2 had no dialog button backgrounds.
    • +
  • #4018 : Firefox2 had no richcombo text visible.
    • +
  • #4035 : [IE6] Paste dialog size was too small.
    • +
  • #4049 : Kama skin was too wide with config.width.
  • The following released files now doesn't require the _source folder
    • -
  • #4085 : Paste and Paste from Word dialogs were not well styled in IE+RTL.
    • -
  • #3982 : Fixed enterKey on empty list item result in weird dom structure.
    • -
  • #4101 : Now it is possible to close dialog before gets focus.
    • -
  • #4075 : [IE6/7]Fixed apply custom inline style with "class" attribute failed.
    • -
  • #4087 : [Firefox]Fixed extra blocks created on create list when full document selected.
    • -
  • #4097 : No undo/redo support for fontColor and backgroundColor buttons.
    • -
  • #4111 : Fixed apply block style after inline style applied on full document error.
    • -
  • #3622 : Fixed shift enter with selection not deleting highlighted text.
    • -
  • #4092 : [IE6] Close button was missing for dialog without multiple tabs.
    • -
  • #4003 : Markup on the image dialog was disrupted when removing the border input.
    • -
  • #4096 : Editor content area was pushed down in IE RTL quirks.
    • -
  • #4112 : [FF] Paste dialog had scrollbars in quirks.
    • -
  • #4118 : Dialog dragging was +
  • #4086 : _samples/ui_languages.html
    • +
  • #4093 : _tests/core/dom/document.html
    • +
  • #4094 : Smiley plugin file
    • +
  • #4097 : No undo/redo support for fontColor and backgroundColor buttons.
    • + +
  • #4085 : Paste and Paste from Word dialogs were not well styled in IE+RTL.
    • +
  • #3982 : Fixed enterKey on empty list item result in weird dom structure.
    • +
  • #4101 : Now it is possible to close dialog before gets focus.
    • +
  • #4075 : [IE6/7]Fixed apply custom inline style with "class" attribute failed.
    • +
  • #4087 : [Firefox]Fixed extra blocks created on create list when full document selected.
    • +
  • #4097 : No undo/redo support for fontColor and backgroundColor buttons.
    • +
  • #4111 : Fixed apply block style after inline style applied on full document error.
    • +
  • #3622 : Fixed shift enter with selection not deleting highlighted text.
    • +
  • #4092 : [IE6] Close button was missing for dialog without multiple tabs.
    • +
  • #4003 : Markup on the image dialog was disrupted when removing the border input.
    • +
  • #4096 : Editor content area was pushed down in IE RTL quirks.
    • +
  • #4112 : [FF] Paste dialog had scrollbars in quirks.
    • +
  • #4118 : Dialog dragging was occasionally behaving strangely .
    • -
  • #4077 : The toolbar combos +
  • #4077 : The toolbar combos were rendering incorrectly in some languages, like Chinese.
    • -
  • #3622 : The toolbar in the v2 +
  • #3622 : The toolbar in the v2 skin was wrapping improperly in some languages.
    • -
  • #4119 : Unable to edit image link with image dialog.
    • -
  • #4117 : Fixed dialog error when transforming image into button.
    • -
  • #4058 : [FF] wysiwyg mode is sometimes not been activated.
    • -
  • #4114 : [IE] RTE + IE6/IE7 Quirks = dialog mispositoned.
    • -
  • #4123 : Some dialog buttons were broken in IE7 quirks.
    • -
  • #4122 : [IE] The image dialog +
  • #4119 : Unable to edit image link with image dialog.
    • +
  • #4117 : Fixed dialog error when transforming image into button.
    • +
  • #4058 : [FF] wysiwyg mode is sometimes not been activated.
    • +
  • #4114 : [IE] RTE + IE6/IE7 Quirks = dialog mispositoned.
    • +
  • #4123 : Some dialog buttons were broken in IE7 quirks.
    • +
  • #4122 : [IE] The image dialog was being rendered improperly when loading an image with long URL.
    • -
  • #4144 : Fixed the white-spaces at the end of <pre> is incorrectly removed.
    • -
  • #4143 : Fixed element id is lost when extracting contents from the range.
    • -
  • #4007 : [IE] Source area overflow from editor chrome.
    • -
  • #4145 : Fixed the on demand +
  • #4144 : Fixed the white-spaces at the end of <pre> is incorrectly removed.
    • +
  • #4143 : Fixed element id is lost when extracting contents from the range.
    • +
  • #4007 : [IE] Source area overflow from editor chrome.
    • +
  • #4145 : Fixed the on demand ("basic") loading model of the editor.
    • -
  • #4139 : Fixed list plugin regression of [3903].
    • -
  • #4147 : Unify style text normalization logic when comparing styles.
    • -
  • #4150 : Fixed enlarge list result incorrect at the inner boundary of block.
    • -
  • #4164 : Now it is possible to paste text +
  • #4139 : Fixed list plugin regression of [3903].
    • +
  • #4147 : Unify style text normalization logic when comparing styles.
    • +
  • #4150 : Fixed enlarge list result incorrect at the inner boundary of block.
    • +
  • #4164 : Now it is possible to paste text in Source mode even if forcePasteAsPlainText = true.
    • -
  • #4129 : [FF]Unable to remove list with Ctrl-A.
    • -
  • #4172 : [Safari] The trailing +
  • #4129 : [FF]Unable to remove list with Ctrl-A.
    • +
  • #4172 : [Safari] The trailing <br> was not been always added to blank lines ending with &nbsp;.
    • -
  • #4178 : It's now possible to +
  • #4178 : It's now possible to copy and paste Flash content among different editor instances.
    • -
  • #4193 : Automatic font color produced empty span on Firefox 3.5.
    • -
  • #4186 : [FF] Fixed First open float panel cause host page scrollbar blinking.
    • -
  • #4227 : Fixed destroy editor instance created on textarea which is not within form cause error.
    • -
  • #4240 : Fixed editor name containing hyphen break editor completely.
    • -
  • #3828 : Malformed nested list is now corrected by the parser.
    • +
  • #4193 : Automatic font color produced empty span on Firefox 3.5.
    • +
  • #4186 : [FF] Fixed First open float panel cause host page scrollbar blinking.
    • +
  • #4227 : Fixed destroy editor instance created on textarea which is not within form cause error.
    • +
  • #4240 : Fixed editor name containing hyphen break editor completely.
    • +
  • #3828 : Malformed nested list is now corrected by the parser.

    • Index: /CKEditor/branches/features/adobeair/_dev/docs_build/docs_build.conf =================================================================== --- /CKEditor/branches/features/adobeair/_dev/docs_build/docs_build.conf (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/docs_build/docs_build.conf (revision 6006) @@ -1,3 +1,3 @@ -/* +/* This is an example of one way you could set up a configuration file to more conveniently define some commandline options. You might like to do this if Index: /CKEditor/branches/features/adobeair/_dev/docs_build/template/class.tmpl =================================================================== --- /CKEditor/branches/features/adobeair/_dev/docs_build/template/class.tmpl (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/docs_build/template/class.tmpl (revision 6006) @@ -273,5 +273,5 @@ !}  -
    {+member.memberOf+}.{+new Link().toSymbol(member.alias).withText(member.name)+}{+makeSignature(member.params)+} +
    {+member.memberOf+}.{+new Link().toSymbol(member.alias).withText(member.name)+}
    {+resolveLinks(summarize(member.desc))+}
    Index: /CKEditor/branches/features/adobeair/_dev/docs_build/template/publish.js =================================================================== --- /CKEditor/branches/features/adobeair/_dev/docs_build/template/publish.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/docs_build/template/publish.js (revision 6006) @@ -1,3 +1,3 @@ -/** Called automatically by JsDoc Toolkit. */ +/** Called automatically by JsDoc Toolkit. */ function publish(symbolSet) { publish.conf = { // trailing slash expected for dirs @@ -79,5 +79,8 @@ symbol.events = symbol.getEvents(); // 1 order matters - symbol.methods = symbol.getMethods(); // 2 + symbol.methods = symbol.getMethods().filter( function( $ ) + { + return !$.isInner; + }); // 2 var output = ""; Index: /CKEditor/branches/features/adobeair/_dev/dtd_test/dtd_test.html =================================================================== --- /CKEditor/branches/features/adobeair/_dev/dtd_test/dtd_test.html (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/dtd_test/dtd_test.html (revision 6006) @@ -11,5 +11,5 @@ // Define the CKEDITOR namespace. -var CKEDITOR = {}; +var CKEDITOR = { on : function(){} }; //]]> Index: /CKEditor/branches/features/adobeair/_dev/fixlineends/fixlineends.bat =================================================================== --- /CKEditor/branches/features/adobeair/_dev/fixlineends/fixlineends.bat (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/fixlineends/fixlineends.bat (revision 6006) @@ -5,3 +5,3 @@ :: -php fixlineends.php --excluderegex=/(?:_dev[\\\/]_thirdparty)/ --eolstripwhite --eofnewline --eofstripwhite --nohidden --nosystem ../../ +php fixlineends.php --excluderegex=/(?:_dev[\\\/]_thirdparty)/ --eolstripwhite --eofnewline --eofstripwhite --nohidden --nosystem --fixbom ../../ Index: /CKEditor/branches/features/adobeair/_dev/fixlineends/fixlineends.php =================================================================== --- /CKEditor/branches/features/adobeair/_dev/fixlineends/fixlineends.php (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/fixlineends/fixlineends.php (revision 6006) @@ -64,4 +64,8 @@ $list["xml"] = CRLF; +$bom = array(); +$bom['asp'] = true; +$bom['js'] = true; + /** * Do not modify anything below @@ -107,4 +111,9 @@ */ $nodotfiles = false; +/** + * If set to true, BOM characters are fixed + * @var boolean $fixbom + */ +$fixbom = false; /** * How deep to recurse into subdirectories @@ -317,4 +326,15 @@ } $new_content .= $line; + } + + if ($GLOBALS['fixbom']) { + $before_fixing = $new_content; + $ext = strtolower(substr($path, strrpos($path, ".") + 1)); + $new_content = stripUtf8Bom( $new_content ); + if (!empty($GLOBALS['bom'][$ext])) { + $new_content = "\xEF\xBB\xBF" . $new_content; // BOM + } + if ($new_content != $before_fixing) + $modified = true; } @@ -353,4 +373,16 @@ /** + * Strip BOM from a string + * @param string $data + */ +function stripUtf8Bom( $data ) +{ + if ( substr( $data, 0, 3 ) == "\xEF\xBB\xBF" ) + return stripUtf8Bom(substr_replace( $data, '', 0, 3 )) ; + + return $data ; +} + +/** * Fix ending lines in all files at given path * @@ -453,18 +485,21 @@ use regex to exclude files, preg_match() format expected + --fixbom + fix BOM characters + --help display this help and exit --noarchive - if set to true, archive files are skipped (Windows only) + skip archive files (Windows only) --nodotfiles - if set to true, dot files are skipped + skip dot files --nohidden - if set to true, hidden files are skipped (Windows only) + skip hidden files (Windows only) --nosystem - if set to true, system files are skipped (Windows only) + skip system files (Windows only) --maxdepth @@ -525,4 +560,8 @@ case '--nodotfiles': $GLOBALS['nodotfiles'] = true; + break; + + case '--fixbom': + $GLOBALS['fixbom'] = true; break; @@ -572,11 +611,11 @@ if ($_SERVER['argc']>1) { - include "../_thirdparty/console_getopt/Getopt.php"; + include "../_thirdparty/console_getopt/Getopt.php"; if ($windows) { - $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "noarchive", "nohidden", "nosystem", "nodotfiles", "maxdepth=", "excluderegex="); + $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "noarchive", "nohidden", "nosystem", "nodotfiles", "maxdepth=", "excluderegex=", "fixbom"); } else { - $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "nodotfiles", "maxdepth=", "excluderegex="); + $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "nodotfiles", "maxdepth=", "excluderegex=", "fixbom"); } Index: /CKEditor/branches/features/adobeair/_dev/packager/packagefilegen_full.html =================================================================== --- /CKEditor/branches/features/adobeair/_dev/packager/packagefilegen_full.html (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/packager/packagefilegen_full.html (revision 6006) @@ -80,5 +80,5 @@ var path = downloaded[i].replace( CKEDITOR.basePath, '' ); - if ( path == 'config.js' ) + if ( path == 'config.js' || /\/styles\/default\.js/.test( path ) ) continue; Index: /CKEditor/branches/features/adobeair/_dev/releaser/release.bat =================================================================== --- /CKEditor/branches/features/adobeair/_dev/releaser/release.bat (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/releaser/release.bat (revision 6006) @@ -11,3 +11,3 @@ :: rmdir /S /Q release -java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.3.2 SVN" ckeditor_3.3.2_svn --run-before-release=langtool.bat +java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.4.2 (SVN)" ckeditor_3.4.2_svn --run-before-release=langtool.bat Index: /CKEditor/branches/features/adobeair/_dev/releaser/release.sh =================================================================== --- /CKEditor/branches/features/adobeair/_dev/releaser/release.sh (revision 6005) +++ /CKEditor/branches/features/adobeair/_dev/releaser/release.sh (revision 6006) @@ -13,4 +13,4 @@ pushd $DIR -java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.3.2 SVN" ckeditor_3.3.2_svn --run-before-release=$LANGTOOL +java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.4.2 (SVN)" ckeditor_3.4.2_svn --run-before-release=$LANGTOOL popd Index: /CKEditor/branches/features/adobeair/_samples/api.html =================================================================== --- /CKEditor/branches/features/adobeair/_samples/api.html (revision 6005) +++ /CKEditor/branches/features/adobeair/_samples/api.html (revision 6006) @@ -64,5 +64,5 @@ } -function ExecuteCommand(commandName) +function ExecuteCommand( commandName ) { // Get the editor instance that we want to interact with. @@ -114,5 +114,5 @@

    - This sample shows how to use the CKeditor JavaScript API to interact with the editor + This sample shows how to use the CKEditor JavaScript API to interact with the editor at runtime.

    Index: /CKEditor/branches/features/adobeair/_samples/api_dialog.html =================================================================== --- /CKEditor/branches/features/adobeair/_samples/api_dialog.html (revision 6005) +++ /CKEditor/branches/features/adobeair/_samples/api_dialog.html (revision 6006) @@ -92,4 +92,11 @@ ] }); + + // Rewrite the 'onFocus' handler to always focus 'url' field. + dialogDefinition.onFocus = function() + { + var urlField = this.getContentElement( 'info', 'url' ); + urlField.select(); + }; } }); Index: /CKEditor/branches/features/adobeair/_samples/assets/swfobject.js =================================================================== --- /CKEditor/branches/features/adobeair/_samples/assets/swfobject.js (revision 6006) +++ /CKEditor/branches/features/adobeair/_samples/assets/swfobject.js (revision 6006) @@ -0,0 +1,18 @@ +/** + * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/ + * + * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License: + * http://www.opensource.org/licenses/mit-license.php + * + */ +/* +Copyright (c) 2007 Geoff Stearns + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +/*jsl:ignoreall*/ +if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="";_19+="";var _1d=this.getParams();for(var key in _1d){_19+="";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="";}_19+="";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.majorfv.major){return true;}if(this.minorfv.minor){return true;}if(this.rev=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject; Index: /CKEditor/branches/features/adobeair/_samples/autogrow.html =================================================================== --- /CKEditor/branches/features/adobeair/_samples/autogrow.html (revision 6006) +++ /CKEditor/branches/features/adobeair/_samples/autogrow.html (revision 6006) @@ -0,0 +1,79 @@ + + + + + AutoGrow Plugin - CKEditor Sample + + + + + + + + +

    + CKEditor Sample +

    + +
    + +
    + +

    + In this sample the AutoGrow plugin is available. It makes the editor grow to fit the size of the content.

    +

    +
    + + +

    +

    +
    + + +

    +

    + +

    + + + + Index: /CKEditor/branches/features/adobeair/_samples/index.html =================================================================== --- /CKEditor/branches/features/adobeair/_samples/index.html (revision 6005) +++ /CKEditor/branches/features/adobeair/_samples/index.html (revision 6006) @@ -42,4 +42,6 @@
  • Output XHTML
  • Output HTML
    • +
  • Output for Flash
    • +
  • AutoGrow plugin
    • '; return { @@ -187,5 +187,5 @@ // Clear previously saved elements. this.fakeImage = this.objectNode = this.embedNode = null; - previewPreloader = new CKEDITOR.dom.element( 'embeded', editor.document ); + previewPreloader = new CKEDITOR.dom.element( 'embed', editor.document ); // Try to detect any embed or object tag that has Flash parameters. Index: /CKEditor/branches/features/adobeair/_source/plugins/flash/plugin.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/flash/plugin.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/flash/plugin.js (revision 6006) @@ -6,13 +6,7 @@ (function() { - var flashFilenameRegex = /\.swf(?:$|\?)/i, - numberRegex = /^\d+(?:\.\d+)?$/; + var flashFilenameRegex = /\.swf(?:$|\?)/i; - function cssifyLength( length ) - { - if ( numberRegex.test( length ) ) - return length + 'px'; - return length; - } + var cssifyLength = CKEDITOR.tools.cssLength; function isFlashEmbed( element ) @@ -91,5 +85,6 @@ editor.contextMenu.addListener( function( element, selection ) { - if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) + if ( element && element.is( 'img' ) && !element.isReadOnly() + && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) return { flash : CKEDITOR.TRISTATE_OFF }; }); Index: /CKEditor/branches/features/adobeair/_source/plugins/floatpanel/plugin.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/floatpanel/plugin.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/floatpanel/plugin.js (revision 6006) @@ -17,12 +17,6 @@ { // Generates the panel key: docId-eleId-skinName-langDir[-uiColor][-CSSs][-level] - var key = - doc.getUniqueId() + - '-' + parentElement.getUniqueId() + - '-' + editor.skinName + - '-' + editor.lang.dir + - ( ( editor.uiColor && ( '-' + editor.uiColor ) ) || '' ) + - ( ( definition.css && ( '-' + definition.css ) ) || '' ) + - ( ( level && ( '-' + level ) ) || '' ); + var key = CKEDITOR.tools.genKey( doc.getUniqueId(), parentElement.getUniqueId(), editor.skinName, editor.lang.dir, + editor.uiColor || '', definition.css || '', level || '' ); var panel = panels[ key ]; @@ -47,5 +41,5 @@ $ : function( editor, parentElement, definition, level ) { - definition.forceIFrame = true; + definition.forceIFrame = 1; var doc = parentElement.getDocument(), @@ -105,5 +99,5 @@ this.allowBlur( false ); - isShowing = true; + isShowing = 1; var element = this.element, @@ -130,12 +124,13 @@ element.setStyles( { - top : top + 'px', - left : '-3000px', - opacity : '0', // FF3 is ignoring "visibility" + top : '-30000px', display : '' }); + // Don't use display or visibility style because we need to + // calculate the rendering layout later and focus the element. + element.setOpacity( 0 ); // To allow the context menu to decrease back their width - element.getFirst().removeStyle('width'); + element.getFirst().removeStyle( 'width' ); // Configure the IFrame blur event. Do that only once. @@ -204,8 +199,8 @@ var widthNode = block.element.$; - if ( CKEDITOR.env.gecko || CKEDITOR.env.opera) + if ( CKEDITOR.env.gecko || CKEDITOR.env.opera ) widthNode = widthNode.parentNode; - if ( CKEDITOR.env.ie) + if ( CKEDITOR.env.ie ) widthNode = widthNode.document.body; @@ -260,11 +255,40 @@ top -= panelSize.height; + // If IE is in RTL, we have troubles with absolute + // position and horizontal scrolls. Here we have a + // series of hacks to workaround it. (#6146) + if ( CKEDITOR.env.ie ) + { + var offsetParent = new CKEDITOR.dom.element( element.$.offsetParent ), + scrollParent = offsetParent; + + // Quirks returns , but standards returns . + if ( scrollParent.getName() == 'html' ) + scrollParent = scrollParent.getDocument().getBody(); + + if ( scrollParent.getComputedStyle( 'direction' ) == 'rtl' ) + { + // For IE8, there is not much logic on this, but it works. + if ( CKEDITOR.env.ie8Compat ) + left -= element.getDocument().getDocumentElement().$.scrollLeft * 2; + else + left -= ( offsetParent.$.scrollWidth - offsetParent.$.clientWidth ); + } + } + + // Trigger the onHide event of the previously active panel to prevent + // incorrect styles from being applied (#6170) + var innerElement = element.getFirst(), + activePanel; + if ( ( activePanel = innerElement.getCustomData( 'activePanel' ) ) ) + activePanel.onHide && activePanel.onHide.call( this, 1 ); + innerElement.setCustomData( 'activePanel', this ); + element.setStyles( { top : top + 'px', - left : left + 'px', - opacity : '1' + left : left + 'px' } ); - + element.setOpacity( 1 ); } , this ); @@ -284,5 +308,5 @@ this.onShow.call( this ); - isShowing = false; + isShowing = 0; }, @@ -294,4 +318,5 @@ this.element.setStyle( 'display', 'none' ); this.visible = 0; + this.element.getFirst().removeCustomData( 'activePanel' ); } }, Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/button.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/button.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/button.js (revision 6006) @@ -13,8 +13,8 @@ delete this.button; var element = this.getParentEditor().getSelection().getSelectedElement(); - if ( element && element.getName() == "input" ) + if ( element && element.is( 'input' ) ) { var type = element.getAttribute( 'type' ); - if ( type == "button" || type == "reset" || type == "submit" ) + if ( type in { button:1, reset:1, submit:1 } ) { this.button = element; Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/checkbox.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/checkbox.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/checkbox.js (revision 6006) @@ -15,5 +15,5 @@ var element = this.getParentEditor().getSelection().getSelectedElement(); - if ( element && element.getAttribute( 'type' ) == "checkbox" ) + if ( element && element.getAttribute( 'type' ) == 'checkbox' ) { this.checkbox = element; @@ -32,8 +32,6 @@ element = editor.document.createElement( 'input' ); element.setAttribute( 'type', 'checkbox' ); + editor.insertElement( element ); } - - if ( isInsertMode ) - editor.insertElement( element ); this.commitContent( { element : element } ); }, @@ -95,5 +93,5 @@ if ( CKEDITOR.env.ie ) { - // Remove attribute 'value' of checkbox #4721. + // Remove attribute 'value' of checkbox (#4721). var checkbox = new CKEDITOR.dom.element( 'input', element.getDocument() ); element.copyAttributes( checkbox, { value: 1 } ); @@ -124,6 +122,6 @@ if ( CKEDITOR.env.ie ) { - var isElementChecked = !!element.getAttribute( 'checked' ); - var isChecked = !!this.getValue(); + var isElementChecked = !!element.getAttribute( 'checked' ), + isChecked = !!this.getValue(); if ( isElementChecked != isChecked ) Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/form.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/form.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/form.js (revision 6006) @@ -105,5 +105,5 @@ label : editor.lang.form.action, 'default' : '', - accessKey : 'A' + accessKey : 'T' }, { Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/radio.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/radio.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/radio.js (revision 6006) @@ -14,5 +14,5 @@ var element = this.getParentEditor().getSelection().getSelectedElement(); - if ( element && element.getName() == "input" && element.getAttribute( 'type' ) == "radio" ) + if ( element && element.getName() == 'input' && element.getAttribute( 'type' ) == 'radio' ) { this.radioButton = element; Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/select.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/select.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/select.js (revision 6006) @@ -162,10 +162,10 @@ if ( isInsertMode ) { - editor.insertElement(element); + editor.insertElement( element ); if ( CKEDITOR.env.ie ) { var sel = editor.getSelection(), bms = sel.createBookmarks(); - setTimeout(function () + setTimeout(function() { sel.selectBookmarks( bms ); @@ -194,5 +194,5 @@ { if ( name == 'clear' ) - this.setValue( '' ); + this.setValue( this['default'] || '' ); else if ( name == 'select' ) { Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/textfield.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/textfield.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/dialogs/textfield.js (revision 6006) @@ -148,5 +148,11 @@ validate : CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed ) } - ] + ], + onLoad : function() + { + // Repaint the style for IE7 (#6068) + if ( CKEDITOR.env.ie7Compat ) + this.getElement().setStyle( 'zoom', '100%' ); + } }, { Index: /CKEditor/branches/features/adobeair/_source/plugins/forms/plugin.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/forms/plugin.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/forms/plugin.js (revision 6006) @@ -28,6 +28,6 @@ 'background-repeat: no-repeat;' + 'border: 1px solid #a9a9a9;' + - 'width: 16px;' + - 'height: 16px;' + + 'width: 16px !important;' + + 'height: 16px !important;' + '}' ); @@ -132,5 +132,5 @@ editor.contextMenu.addListener( function( element ) { - if ( element && element.hasAscendant( 'form', true ) ) + if ( element && element.hasAscendant( 'form', true ) && !element.isReadOnly() ) return { form : CKEDITOR.TRISTATE_OFF }; }); @@ -138,5 +138,5 @@ editor.contextMenu.addListener( function( element ) { - if ( element ) + if ( element && !element.isReadOnly() ) { var name = element.getName(); @@ -192,8 +192,11 @@ switch ( type ) { - case 'text' : case 'password': + case 'text' : + case 'password' : evt.data.dialog = 'textfield'; break; - case 'button' : case 'submit' : case 'reset' : + case 'button' : + case 'submit' : + case 'reset' : evt.data.dialog = 'button'; break; Index: /CKEditor/branches/features/adobeair/_source/plugins/htmldataprocessor/plugin.js =================================================================== --- /CKEditor/branches/features/adobeair/_source/plugins/htmldataprocessor/plugin.js (revision 6005) +++ /CKEditor/branches/features/adobeair/_source/plugins/htmldataprocessor/plugin.js (revision 6006) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -202,5 +202,6 @@ title : function( element ) { - element.children[ 0 ].value = element.attributes[ '_cke_title' ]; + var titleText = element.children[ 0 ]; + titleText && ( titleText.value = element.attributes[ '_cke_title' ] || '' ); } }, @@ -263,5 +264,6 @@ } - var protectAttributeRegex = /<(?:a|area|img|input)[\s\S]*?\s((?:href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi; + var protectAttributeRegex = /<((?:a|area|img|input)[\s\S]*?\s)((href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))([^>]*)>/gi, + findSavedSrcRegex = /\s_cke_saved_src\s*=/; var protectElementsRegex = /(?:])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi, @@ -275,5 +277,12 @@ function protectAttributes( html ) { - return html.replace( protectAttributeRegex, '$& _cke_saved_$1' ); + return html.replace( protectAttributeRegex, function( tag, beginning, fullAttr, attrName, end ) + { + // We should not rewrite the _cke_saved_src attribute (#5218) + if ( attrName == 'src' && findSavedSrcRegex.test( tag ) ) + return tag; + else + return '<' + beginning + fullAttr + ' _cke_saved_' + fullAttr + end + '>'; + }); } @@ -307,4 +316,9 @@ { return html.replace( protectSelfClosingRegex, '' ); + } + + function protectPreFormatted( html ) + { + return html.replace( /(]*>)(\r\n|\n)/g, '$1$2$2' ); } @@ -429,4 +443,8 @@ data = protectSelfClosingElements( data ); + // Compensate one leading line break after 
     open as browsers
+			// eat it up. (#5789)
+			data = protectPreFormatted( data );
+
 			// Call the browser to help us fixing a possibly invalid HTML
 			// structure.
@@ -483,3 +501,2 @@
  * config.forceSimpleAmpersand = false;
  */
-CKEDITOR.config.forceSimpleAmpersand = false;
Index: /CKEditor/branches/features/adobeair/_source/plugins/htmlwriter/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/htmlwriter/plugin.js	(revision 6005)
+++ /CKEditor/branches/features/adobeair/_source/plugins/htmlwriter/plugin.js	(revision 6006)
@@ -58,10 +58,12 @@
 		this.lineBreakChars = '\n';
 
-		this.forceSimpleAmpersand = false;
-
-		this.sortAttributes = true;
-
-		this._.indent = false;
+		this.forceSimpleAmpersand = 0;
+
+		this.sortAttributes = 1;
+
+		this._.indent = 0;
 		this._.indentation = '';
+		// Indicate preformatted block context status. (#5789)
+		this._.inPre = 0;
 		this._.rules = {};
 
@@ -72,9 +74,9 @@
 			this.setRules( e,
 				{
-					indent : true,
-					breakBeforeOpen : true,
-					breakAfterOpen : true,
+					indent : 1,
+					breakBeforeOpen : 1,
+					breakAfterOpen : 1,
 					breakBeforeClose : !dtd[ e ][ '#' ],
-					breakAfterClose : true
+					breakAfterClose : 1
 				});
 		}
@@ -82,17 +84,17 @@
 		this.setRules( 'br',
 			{
-				breakAfterOpen : true
+				breakAfterOpen : 1
 			});
 
 		this.setRules( 'title',
 			{
-				indent : false,
-				breakAfterOpen : false
+				indent : 0,
+				breakAfterOpen : 0
 			});
 
 		this.setRules( 'style',
 			{
-				indent : false,
-				breakBeforeClose : true
+				indent : 0,
+				breakBeforeClose : 1
 			});
 
@@ -100,5 +102,5 @@
 		this.setRules( 'pre',
 			{
-			  indent: false
+			  indent : 0
 			});
 	},
@@ -159,4 +161,5 @@
 			if ( rules && rules.breakAfterOpen )
 				this.lineBreak();
+			tagName == 'pre' && ( this._.inPre = 1 );
 		},
 
@@ -207,4 +210,5 @@
 
 			this._.output.push( '' );
+			tagName == 'pre' && ( this._.inPre = 0 );
 
 			if ( rules && rules.breakAfterClose )
@@ -224,5 +228,5 @@
 			{
 				this.indentation();
-				text = CKEDITOR.tools.ltrim( text );
+				!this._.inPre  && ( text = CKEDITOR.tools.ltrim( text ) );
 			}
 
@@ -253,7 +257,7 @@
 		lineBreak : function()
 		{
-			if ( this._.output.length > 0 )
+			if ( !this._.inPre && this._.output.length > 0 )
 				this._.output.push( this.lineBreakChars );
-			this._.indent = true;
+			this._.indent = 1;
 		},
 
@@ -268,6 +272,7 @@
 		indentation : function()
 		{
-			this._.output.push( this._.indentation );
-			this._.indent = false;
+			if( !this._.inPre )
+				this._.output.push( this._.indentation );
+			this._.indent = 0;
 		},
 
Index: /CKEditor/branches/features/adobeair/_source/plugins/iframedialog/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/iframedialog/plugin.js	(revision 6005)
+++ /CKEditor/branches/features/adobeair/_source/plugins/iframedialog/plugin.js	(revision 6006)
@@ -75,5 +75,5 @@
 					cssWidth = CKEDITOR.tools.cssLength( elementDefinition.width ),
 					cssHeight = CKEDITOR.tools.cssLength( elementDefinition.height );
-				_.frameId = CKEDITOR.tools.getNextNumber() + '_iframe';
+				_.frameId = CKEDITOR.tools.getNextId() + '_iframe';
 
 				// IE BUG: Parent container does not resize to contain the iframe automatically.
Index: /CKEditor/branches/features/adobeair/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/image/dialogs/image.js	(revision 6005)
+++ /CKEditor/branches/features/adobeair/_source/plugins/image/dialogs/image.js	(revision 6006)
@@ -251,5 +251,8 @@
 		};
 
-		var numbering = function( id ){ return id + CKEDITOR.tools.getNextNumber(); },
+		var numbering = function( id )
+			{
+				return CKEDITOR.tools.getNextId() + '_' + id;
+			},
 			btnLockSizesId = numbering( 'btnLockSizes' ),
 			btnResetSizeId = numbering( 'btnResetSize' ),
@@ -539,5 +542,4 @@
 													// Manually set the initial value.(#4191)
 													field.setInitValue();
-													field.focus();
 												}
 											},
@@ -576,5 +578,5 @@
 							type : 'text',
 							label : editor.lang.image.alt,
-							accessKey : 'A',
+							accessKey : 'T',
 							'default' : '',
 							onChange : function()
@@ -665,5 +667,5 @@
 																	}
 																	else
-																		element.setStyle( 'width', value + 'px');
+																		element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
 																}
 																else if ( type == CLEANUP )
@@ -716,5 +718,5 @@
 																	}
 																	else
-																		element.setStyle( 'height', value + 'px' );
+																		element.setStyle( 'height',  CKEDITOR.tools.cssLength( value ) );
 																}
 																else if ( type == CLEANUP )
@@ -1126,5 +1128,5 @@
 								action : 'Browse',
 								target: 'Link:txtUrl',
-								url: editor.config.filebrowserImageBrowseLinkUrl || editor.config.filebrowserBrowseUrl
+								url: editor.config.filebrowserImageBrowseLinkUrl
 							},
 							style : 'float:right',
Index: /CKEditor/branches/features/adobeair/_source/plugins/image/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/image/plugin.js	(revision 6005)
+++ /CKEditor/branches/features/adobeair/_source/plugins/image/plugin.js	(revision 6006)
@@ -54,5 +54,5 @@
 			editor.contextMenu.addListener( function( element, selection )
 				{
-					if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) )
+					if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) || element.isReadOnly() )
 						return null;
 
Index: /CKEditor/branches/features/adobeair/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/branches/features/adobeair/_source/plugins/indent/plugin.js	(revision 6005)
+++ /CKEditor/branches/features/adobeair/_source/plugins/indent/plugin.js	(revision 6006)
@@ -54,5 +54,5 @@
 		else
 		{
-			var indent = parseInt( firstBlock.getStyle( this.indentCssProperty ), 10 );
+			var indent = parseInt( firstBlock.getStyle( getIndentCssProperty( firstBlock ) ), 10 );
 			if ( isNaN( indent ) )
 				indent = 0;
@@ -62,185 +62,4 @@
 		}
 	}
-
-	function indentList( editor, range, listNode )
-	{
-		// Our starting and ending points of the range might be inside some blocks under a list item...
-		// So before playing with the iterator, we need to expand the block to include the list items.
-		var startContainer = range.startContainer,
-			endContainer = range.endContainer;
-		while ( startContainer && !startContainer.getParent().equals( listNode ) )
-			startContainer = startContainer.getParent();
-		while ( endContainer && !endContainer.getParent().equals( listNode ) )
-			endContainer = endContainer.getParent();
-
-		if ( !startContainer || !endContainer )
-			return;
-
-		// Now we can iterate over the individual items on the same tree depth.
-		var block = startContainer,
-			itemsToMove = [],
-			stopFlag = false;
-		while ( !stopFlag )
-		{
-			if ( block.equals( endContainer ) )
-				stopFlag = true;
-			itemsToMove.push( block );
-			block = block.getNext();
-		}
-		if ( itemsToMove.length < 1 )
-			return;
-
-		// Do indent or outdent operations on the array model of the list, not the
-		// list's DOM tree itself. The array model demands that it knows as much as
-		// possible about the surrounding lists, we need to feed it the further
-		// ancestor node that is still a list.
-		var listParents = listNode.getParents( true );
-		for ( var i = 0 ; i < listParents.length ; i++ )
-		{
-			if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] )
-			{
-				listNode = listParents[i];
-				break;
-			}
-		}
-		var indentOffset = this.name == 'indent' ? 1 : -1,
-			startItem = itemsToMove[0],
-			lastItem = itemsToMove[ itemsToMove.length - 1 ],
-			database = {};
-
-		// Convert the list DOM tree into a one dimensional array.
-		var listArray = CKEDITOR.plugins.list.listToArray( listNode, database );
-
-		// Apply indenting or outdenting on the array.
-		var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;
-		for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ )
-		{
-			listArray[ i ].indent += indentOffset;
-			// Make sure the newly created sublist get a brand-new element of the same type. (#5372)
-			var listRoot = listArray[ i ].parent;
-			listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() );
-		}
-
-		for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
-				i < listArray.length && listArray[i].indent > baseIndent ; i++ )
-			listArray[i].indent += indentOffset;
-
-		// Convert the array back to a DOM forest (yes we might have a few subtrees now).
-		// And replace the old list with the new forest.
-		var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 );
-
-		// Avoid nested 
  •  after outdent even they're visually same,
-		// recording them for later refactoring.(#3982)
-		if ( this.name == 'outdent' )
-		{
-			var parentLiElement;
-			if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )
-			{
-				var children = newList.listNode.getChildren(),
-					pendingLis = [],
-					count = children.count(),
-					child;
-
-				for ( i = count - 1 ; i >= 0 ; i-- )
-				{
-					if ( ( child = children.getItem( i ) ) && child.is && child.is( 'li' )  )
-						pendingLis.push( child );
-				}
-			}
-		}
-
-		if ( newList )
-			newList.listNode.replace( listNode );
-
-		// Move the nested 
  •  to be appeared after the parent.
-		if ( pendingLis && pendingLis.length )
-		{
-			for (  i = 0; i < pendingLis.length ; i++ )
-			{
-				var li = pendingLis[ i ],
-					followingList = li;
-
-				// Nest preceding