X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fflash%2Fdialogs%2Fflash.js;h=0e74e01e8f071b9888296e9d95304aa20378c460;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hp=2359b1b986785263a8cc742cd9ae46d97f80a5ca;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git
diff --git a/_source/plugins/flash/dialogs/flash.js b/_source/plugins/flash/dialogs/flash.js
index 2359b1b..0e74e01 100644
--- a/_source/plugins/flash/dialogs/flash.js
+++ b/_source/plugins/flash/dialogs/flash.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -24,7 +24,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var attributesMap =
{
- id : [ { type : ATTRTYPE_OBJECT, name : CKEDITOR.env.ie ? '_cke_saved_id' : 'id' } ],
+ id : [ { type : ATTRTYPE_OBJECT, name : 'id' } ],
classid : [ { type : ATTRTYPE_OBJECT, name : 'classid' } ],
codebase : [ { type : ATTRTYPE_OBJECT, name : 'codebase'} ],
pluginspage : [ { type : ATTRTYPE_EMBED, name : 'pluginspage' } ],
@@ -173,7 +173,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var makeObjectTag = !editor.config.flashEmbedTagOnly,
makeEmbedTag = editor.config.flashAddEmbedTag || editor.config.flashEmbedTagOnly;
- var previewAreaHtml = '
' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +'
' +
+ var previewPreloader,
+ previewAreaHtml = '
' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +'
' +
'
' +
'
';
@@ -185,6 +186,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
// Clear previously saved elements.
this.fakeImage = this.objectNode = this.embedNode = null;
+ previewPreloader = new CKEDITOR.dom.element( 'embeded', editor.document );
// Try to detect any embed or object tag that has Flash parameters.
var fakeImage = this.getSelectedElement();
@@ -271,7 +273,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var newFakeImage = editor.createFakeElement( objectNode || embedNode, 'cke_flash', 'flash', true );
newFakeImage.setStyles( extraStyles );
if ( this.fakeImage )
+ {
newFakeImage.replace( this.fakeImage );
+ editor.getSelection().selectElement( newFakeImage );
+ }
else
editor.insertElement( newFakeImage );
},
@@ -315,9 +320,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
var dialog = this.getDialog(),
updatePreview = function( src ){
-
+ // Query the preloader to figure out the url impacted by based href.
+ previewPreloader.setAttribute( 'src', src );
dialog.preview.setHtml( '
' );
};
// Preview element
@@ -556,15 +562,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
items :
[
[ editor.lang.common.notSet , ''],
- [ editor.lang.image.alignLeft , 'left'],
- [ editor.lang.image.alignAbsBottom , 'absBottom'],
- [ editor.lang.image.alignAbsMiddle , 'absMiddle'],
- [ editor.lang.image.alignBaseline , 'baseline'],
- [ editor.lang.image.alignBottom , 'bottom'],
- [ editor.lang.image.alignMiddle , 'middle'],
- [ editor.lang.image.alignRight , 'right'],
- [ editor.lang.image.alignTextTop , 'textTop'],
- [ editor.lang.image.alignTop , 'top']
+ [ editor.lang.flash.alignLeft , 'left'],
+ [ editor.lang.flash.alignAbsBottom , 'absBottom'],
+ [ editor.lang.flash.alignAbsMiddle , 'absMiddle'],
+ [ editor.lang.flash.alignBaseline , 'baseline'],
+ [ editor.lang.flash.alignBottom , 'bottom'],
+ [ editor.lang.flash.alignMiddle , 'middle'],
+ [ editor.lang.flash.alignRight , 'right'],
+ [ editor.lang.flash.alignTextTop , 'textTop'],
+ [ editor.lang.flash.alignTop , 'top']
],
setup : loadValue,
commit : commitValue