Index: _dev/fckreleaser.xml =================================================================== --- _dev/fckreleaser.xml (revision 1591) +++ _dev/fckreleaser.xml (working copy) @@ -28,13 +28,14 @@ - + + Index: _samples/adobeair/application.xml =================================================================== --- _samples/adobeair/application.xml (revision 0) +++ _samples/adobeair/application.xml (revision 0) @@ -0,0 +1,29 @@ + + + + net.fckeditor.air.samples.sample01 + FCKeditor Sample Application 1.0 + 1.0 + FCKeditor AIR Sample + This is a sample AIR application including FCKeditor. + Copyright (C) 2003-2008 Frederico Caldeira Knabben + + _samples/adobeair/sample01.html + FCKeditor AIR Sample + standard + false + true + true + true + true + 100 + 80 + 800 + 600 + 600 400 + + FCKeditor/AIR Samples/Sample01 + FCKeditor/AIR Samples + false + false + Index: _samples/adobeair/run.bat =================================================================== --- _samples/adobeair/run.bat (revision 0) +++ _samples/adobeair/run.bat (revision 0) @@ -0,0 +1,26 @@ +@ECHO OFF + +:: +:: FCKeditor - The text editor for Internet - http://www.fckeditor.net +:: Copyright (C) 2003-2008 Frederico Caldeira Knabben +:: +:: == BEGIN LICENSE == +:: +:: Licensed under the terms of any of the following licenses at your +:: choice: +:: +:: - GNU General Public License Version 2 or later (the "GPL") +:: http://www.gnu.org/licenses/gpl.html +:: +:: - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +:: http://www.gnu.org/licenses/lgpl.html +:: +:: - Mozilla Public License Version 1.1 or later (the "MPL") +:: http://www.mozilla.org/MPL/MPL-1.1.html +:: +:: == END LICENSE == +:: + +:: adl [-runtime runtime-directory] [-pubId publisher-id] [-nodebug] application.xml [rootdirectory] [-- arguments] + +"C:\Adobe AIR SDK\bin\adl" application.xml ../../ Index: _samples/adobeair/sample01.html =================================================================== --- _samples/adobeair/sample01.html (revision 0) +++ _samples/adobeair/sample01.html (revision 0) @@ -0,0 +1,58 @@ + + + + + FCKeditor - Adobe AIR Sample + + + + + + + +

+ FCKeditor - Adobe AIR Sample +

+
+ This sample loads FCKeditor with full features enabled. +
+
+ + + Index: _whatsnew.html =================================================================== --- _whatsnew.html (revision 1591) +++ _whatsnew.html (working copy) @@ -37,6 +37,8 @@

New Features and Improvements:

    +
  • [#1886] + Adobe AIR compatibility.
  • [#123] Full support for document.domain with automatic domain detection.
  • New language file for Canadian French.
    • Index: editor/_source/classes/fckeditingarea.js =================================================================== --- editor/_source/classes/fckeditingarea.js (revision 1591) +++ editor/_source/classes/fckeditingarea.js (working copy) @@ -133,6 +133,9 @@ oDoc.close() ; } + if ( FCKBrowserInfo.IsAIR ) + FCKAdobeAIR.EditingArea_Start( oDoc, html ) ; + // Firefox 1.0.x is buggy... ohh yes... so let's do it two times and it // will magically work. if ( FCKBrowserInfo.IsGecko10 && !secondCall ) Index: editor/_source/classes/fckpanel.js =================================================================== --- editor/_source/classes/fckpanel.js (revision 1591) +++ editor/_source/classes/fckpanel.js (working copy) @@ -80,6 +80,9 @@ oDocument.write( '' + sBase + '<\/head><\/body><\/html>' ) ; oDocument.close() ; + if( FCKBrowserInfo.IsAIR ) + FCKAdobeAIR.Panel_Contructor( oDocument, window.document.location ) ; + FCKTools.AddEventListenerEx( oIFrameWindow, 'focus', FCKPanel_Window_OnFocus, this ) ; FCKTools.AddEventListenerEx( oIFrameWindow, 'blur', FCKPanel_Window_OnBlur, this ) ; } Index: editor/_source/fckeditorapi.js =================================================================== --- editor/_source/fckeditorapi.js (revision 1591) +++ editor/_source/fckeditorapi.js (working copy) @@ -39,7 +39,7 @@ // code (like JSON) can extend the Object prototype and we get then extra oEditor // objects that aren't really FCKeditor instances. var sScript = - 'var FCKeditorAPI = {' + + 'window.FCKeditorAPI = {' + 'Version : "[Development]",' + 'VersionBuild : "[DEV]",' + '__Instances : new Object(),' + @@ -111,6 +111,10 @@ // following seams to work well. eval.call( oParentWindow, sScript ) ; } + else if( FCKBrowserInfo.IsAIR ) + { + FCKAdobeAIR.FCKeditorAPI_Evaluate( oParentWindow, sScript ) ; + } else if ( FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsGecko19 ) { // oParentWindow.eval in Safari and Gran Paradiso executes in the calling window Index: editor/_source/internals/fckbrowserinfo.js =================================================================== --- editor/_source/internals/fckbrowserinfo.js (revision 1591) +++ editor/_source/internals/fckbrowserinfo.js (working copy) @@ -31,6 +31,7 @@ IsGecko : s.Contains('gecko/'), IsSafari : s.Contains(' applewebkit/'), // Read "IsWebKit" IsOpera : !!window.opera, + IsAIR : s.Contains(' adobeair/'), IsMac : s.Contains('macintosh') } ; Index: editor/_source/internals/fcktoolbarset.js =================================================================== --- editor/_source/internals/fcktoolbarset.js (revision 1591) +++ editor/_source/internals/fcktoolbarset.js (working copy) @@ -50,7 +50,10 @@ var oOutMatch = sLocation.match( /^Out:(.+)\((\w+)\)$/ ) ; if ( oOutMatch ) { - eToolbarTarget = eval( 'parent.' + oOutMatch[1] ).document.getElementById( oOutMatch[2] ) ; + if ( FCKBrowserInfo.IsAIR ) + FCKAdobeAIR.ToolbarSet_GetOutElement( window, oOutMatch ) ; + else + eToolbarTarget = eval( 'parent.' + oOutMatch[1] ).document.getElementById( oOutMatch[2] ) ; } else { @@ -111,6 +114,9 @@ + '' + document.getElementById( 'xToolbarSpace' ).innerHTML + '' ) ; eTargetDocument.close() ; + if( FCKBrowserInfo.IsAIR ) + FCKAdobeAIR.ToolbarSet_InitOutFrame( eTargetDocument ) ; + FCKTools.AddEventListener( eTargetDocument, 'contextmenu', FCKTools.CancelEvent ) ; // Load external resources (must be done here, otherwise Firefox will not Index: editor/fckeditor.html =================================================================== --- editor/fckeditor.html (revision 1591) +++ editor/fckeditor.html (working copy) @@ -198,6 +198,10 @@