Ticket #4648: 4648_2.patch

_source/core/config.js

@@ -243 +243 @@
          * @type String
          * @example
          */
-        plugins : 'about,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'about,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,iframe,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
          * List of additional plugins to be loaded. This is a tool setting which

_source/lang/en.js

@@ -611 +611 @@
                 remove                          : 'Remove Div'
         },
 
+        iframe :
+        {
+                title           : 'Iframe Properties',
+                toolbar         : 'Iframe',
+                height          : 'Height',
+                width           : 'Width',
+                invalidHeight   : 'Iframe height must be a number.',
+                invalidWidth    : 'Iframe width must be a number.',
+                noUrl           : 'Please type the iframe URL',
+                scrolling               : 'Enable scrollbars',
+                border          : 'Show frame border'
+        },
+
         font :
         {
                 label           : 'Font',

_source/plugins/iframe/dialogs/iframe.js

@@ +1 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+        // Map 'true' and 'false' values to match W3C's specifications: http://www.w3.org/TR/REC-html40/present/frames.html#h-16.5
+        var checkboxValues =
+        {
+                scrolling : { 'true' : 'yes', 'false' : 'no' },
+                frameborder : { 'true' : '1', 'false' : '0' }
+        }
+        
+        function loadValue( iframeNode )
+        {
+                var isCheckbox = this instanceof CKEDITOR.ui.dialog.checkbox;
+                if ( iframeNode.hasAttribute( this.id ) )
+                {
+                        var value = iframeNode.getAttribute( this.id );
+                        if ( isCheckbox )
+                                this.setValue( checkboxValues[this.id]['true'] == value.toLowerCase() );
+                        else
+                                this.setValue( value );
+                }
+        }
+
+        function commitValue( iframeNode )
+        {
+                var isRemove = this.getValue() === '',
+                        isCheckbox = this instanceof CKEDITOR.ui.dialog.checkbox,
+                        value = this.getValue();
+                if ( isRemove )
+                        iframeNode.removeAttribute( this.id );
+                else if ( isCheckbox )
+                        iframeNode.setAttribute( this.id, checkboxValues[this.id][value] );
+                else
+                        iframeNode.setAttribute( this.id, value );
+        }
+
+        CKEDITOR.dialog.add( 'iframe', function( editor )
+        {
+                var iframeLang = editor.lang.iframe,
+                        commonLang = editor.lang.common;
+                return {
+                        title : editor.lang.iframe.title,
+                        minWidth : 300,
+                        minHeight : 220,
+                        onShow : function()
+                        {
+                                // Clear previously saved elements.
+                                this.fakeImage = this.iframeNode = null;
+
+                                var fakeImage = this.getSelectedElement();
+                                if ( fakeImage && fakeImage.getAttribute( '_cke_real_element_type' ) && fakeImage.getAttribute( '_cke_real_element_type' ) == 'iframe' )
+                                {
+                                        this.fakeImage = fakeImage;
+
+                                        var iframeNode = editor.restoreRealElement( fakeImage );
+                                        this.iframeNode = iframeNode;
+
+                                        this.setupContent( iframeNode, fakeImage );
+                                }
+                        },
+                        onOk : function()
+                        {
+                                var iframeNode;
+                                if ( !this.fakeImage )
+                                        iframeNode = CKEDITOR.dom.element.createFromHtml( '<cke:iframe></cke:iframe>', editor.document );
+                                else
+                                        iframeNode = this.iframeNode;
+
+                                // A subset of the specified attributes/styles
+                                // should also be applied on the fake element to
+                                // have better visual effect. (#5240)
+                                var extraStyles = {}, extraAttributes = {};
+                                this.commitContent( iframeNode, extraStyles, extraAttributes );
+
+                                // Refresh the fake image.
+                                var newFakeImage = editor.createFakeElement( iframeNode, 'cke_iframe', 'iframe', true );
+                                newFakeImage.setAttributes( extraAttributes );
+                                newFakeImage.setStyles( extraStyles );
+                                if ( this.fakeImage )
+                                {
+                                        newFakeImage.replace( this.fakeImage );
+                                        editor.getSelection().selectElement( newFakeImage );
+                                }
+                                else
+                                        editor.insertElement( newFakeImage );
+                        },
+                        contents : [
+                                {
+                                        id : 'info',
+                                        label : editor.lang.common.generalTab,
+                                        accessKey : 'I',
+                                        elements :
+                                        [
+                                                {
+                                                        type : 'vbox',
+                                                        padding : 0,
+                                                        children :
+                                                        [
+                                                                {
+                                                                        id : 'src',
+                                                                        type : 'text',
+                                                                        label : commonLang.url,
+                                                                        required : true,
+                                                                        validate : CKEDITOR.dialog.validate.notEmpty( iframeLang.noUrl ),
+                                                                        setup : loadValue,
+                                                                        commit : commitValue
+                                                                }
+                                                        ]
+                                                },
+                                                {
+                                                        type : 'hbox',
+                                                        widths : [ '25%', '25%' ],
+                                                        children :
+                                                        [
+                                                                {
+                                                                        id : 'width',
+                                                                        type : 'text',
+                                                                        style : 'width:80px',
+                                                                        labelLayout : 'vertical',
+                                                                        label : iframeLang.width,
+                                                                        validate : CKEDITOR.dialog.validate.integer( iframeLang.invalidWidth ),
+                                                                        setup : function( iframeNode, fakeImage )
+                                                                        {
+                                                                                loadValue.apply( this, arguments );
+                                                                                if ( fakeImage )
+                                                                                {
+                                                                                        var fakeImageWidth = parseInt( fakeImage.$.style.width, 10 );
+                                                                                        if ( !isNaN( fakeImageWidth ) )
+                                                                                                this.setValue( fakeImageWidth );
+                                                                                }
+                                                                        },
+                                                                        commit : function( iframeNode, extraStyles )
+                                                                        {
+                                                                                commitValue.apply( this, arguments );
+                                                                                if ( this.getValue() )
+                                                                                        extraStyles.width = this.getValue() + 'px';
+                                                                        }
+                                                                },
+                                                                {
+                                                                        id : 'height',
+                                                                        type : 'text',
+                                                                        style : 'width:80px',
+                                                                        label : iframeLang.height,
+                                                                        labelLayout : 'vertical',
+                                                                        validate : CKEDITOR.dialog.validate.integer( iframeLang.invalidHeight ),
+                                                                        setup : function( iframeNode, fakeImage )
+                                                                        {
+                                                                                loadValue.apply( this, arguments );
+                                                                                if ( fakeImage )
+                                                                                {
+                                                                                        var fakeImageHeight = parseInt( fakeImage.$.style.height, 10 );
+                                                                                        if ( !isNaN( fakeImageHeight ) )
+                                                                                                this.setValue( fakeImageHeight );
+                                                                                }
+                                                                        },
+                                                                        commit : function( iframeNode, extraStyles )
+                                                                        {
+                                                                                commitValue.apply( this, arguments );
+                                                                                if ( this.getValue() )
+                                                                                        extraStyles.height = this.getValue() + 'px';
+                                                                        }
+                                                                }
+                                                        ]
+                                                },
+                                                {
+                                                        type : 'hbox',
+                                                        widths : [ '50%', '50%' ],
+                                                        children :
+                                                        [
+                                                                {
+                                                                        id : 'scrolling',
+                                                                        type : 'checkbox',
+                                                                        label : iframeLang.scrolling,
+                                                                        setup : loadValue,
+                                                                        commit : commitValue
+                                                                },
+                                                                {
+                                                                        id : 'frameborder',
+                                                                        type : 'checkbox',
+                                                                        label : iframeLang.border,
+                                                                        setup : loadValue,
+                                                                        commit : commitValue
+                                                                }
+                                                        ]
+                                                },
+                                                {
+                                                        type : 'hbox',
+                                                        widths : [ '45%', '55%' ],
+                                                        children :
+                                                        [
+                                                                {
+                                                                        id : 'id',
+                                                                        type : 'text',
+                                                                        label : commonLang.id,
+                                                                        setup : loadValue,
+                                                                        commit : commitValue
+                                                                },
+                                                                {
+                                                                        id : 'title',
+                                                                        type : 'text',
+                                                                        label : commonLang.advisoryTitle,
+                                                                        setup : loadValue,
+                                                                        commit : commitValue
+                                                                }
+                                                        ]
+                                                },
+                                                {
+                                                        type : 'hbox',
+                                                        widths : [ '45%', '55%' ],
+                                                        children :
+                                                        [
+                                                                {
+                                                                        id : 'class',
+                                                                        type : 'text',
+                                                                        label : commonLang.cssClass,
+                                                                        setup : loadValue,
+                                                                        commit : commitValue
+                                                                }
+                                                        ]
+                                                },
+                                                {
+                                                        id : 'style',
+                                                        type : 'text',
+                                                        label : commonLang.cssStyle,
+                                                        setup : loadValue,
+                                                        commit : commitValue
+                                                }
+                                        ]
+                                }
+                        ]
+                };
+        });
+})();

_source/plugins/iframe/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+        function createFakeElement( editor, realElement )
+        {
+                var fakeElement = editor.createFakeParserElement( realElement, 'cke_iframe', 'iframe', true ),
+                        fakeStyle = fakeElement.attributes.style || '';
+
+                var width = realElement.attributes.width,
+                        height = realElement.attributes.height;
+
+                if ( typeof width != 'undefined' )
+                        fakeStyle += 'width:' + CKEDITOR.tools.cssLength( width ) + ';';
+
+                if ( typeof height != 'undefined' )
+                        fakeStyle += 'height:' + CKEDITOR.tools.cssLength( height ) + ';';
+
+                fakeElement.attributes.style = fakeStyle;
+
+                return fakeElement;
+        }
+
+        CKEDITOR.plugins.add( 'iframe',
+        {
+                requires : [ 'dialog', 'fakeobjects' ],
+                init : function( editor )
+                {
+                        var pluginName = 'iframe',
+                                lang = editor.lang.iframe;
+
+                        CKEDITOR.dialog.add( pluginName, this.path + 'dialogs/iframe.js' );
+                        editor.addCommand( pluginName, new CKEDITOR.dialogCommand( pluginName ) );
+
+                        editor.addCss(
+                                'img.cke_iframe' +
+                                '{' +
+                                        'background-image: url(' + CKEDITOR.getUrl( this.path + 'images/placeholder.png' ) + ');' +
+                                        'background-position: center center;' +
+                                        'background-repeat: no-repeat;' +
+                                        'border: 1px solid #a9a9a9;' +
+                                        'width: 80px;' +
+                                        'height: 80px;' +
+                                '}'
+                        );
+
+                        editor.ui.addButton( 'Iframe',
+                                {
+                                        label : lang.toolbar,
+                                        command : pluginName
+                                });
+
+                        editor.on( 'doubleclick', function( evt )
+                                {
+                                        var element = evt.data.element;
+                                        if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'iframe' )
+                                                evt.data.dialog = 'iframe';
+                                });
+
+                        if ( editor.addMenuItems )
+                        {
+                                editor.addMenuItems(
+                                {
+                                        iframe :
+                                        {
+                                                label : lang.title,
+                                                command : 'iframe',
+                                                group : 'image'
+                                        }
+                                });
+                        }
+
+                        // If the "contextmenu" plugin is loaded, register the listeners.
+                        if ( editor.contextMenu )
+                        {
+                                editor.contextMenu.addListener( function( element, selection )
+                                        {
+                                                if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'iframe' )
+                                                        return { iframe : CKEDITOR.TRISTATE_OFF };
+                                        });
+                        }
+                },
+                afterInit : function( editor )
+                {
+                        var dataProcessor = editor.dataProcessor,
+                                dataFilter = dataProcessor && dataProcessor.dataFilter;
+
+                        if ( dataFilter )
+                        {
+                                dataFilter.addRules(
+                                {
+                                        elements :
+                                        {
+                                                iframe : function( element )
+                                                {
+                                                        return createFakeElement( editor, element );
+                                                }
+                                        }
+                                });
+                        }
+                }
+        });
+})();

_source/plugins/slicktag/plugin.js

@@ +1 @@
+if( sitePhrases.slickTag && siteSettings.slickTagDialog )
+{
+        CKEDITOR.plugins.add( 'slicktag',
+        {
+                requires : [ 'iframedialog', 'selection' ],
+                init : function( editor )
+                {
+                        editor.addCommand( 'slickTag', new CKEDITOR.dialogCommand( 'slickTag' ) );
+                        editor.ui.addButton( 'SlickTag',
+                                {
+                                        label : sitePhrases.slickTag,
+                                        command : 'slickTag',
+                                        icon : this.path + '../../skins/' + editor.config.skin + '/icons.png'
+                                });
+                        var contents = [], tab, definition, j;
+                        var dialog;
+                        var fn = CKEDITOR.tools.addFunction( function( title, contentOpener, separator, contentCloser )
+                        {
+                                /*var span = editor.document.createElement( 'span',
+                                {
+                                        attributes :
+                                        {
+                                                'class' : 'slick_tag'
+                                        }
+                                });
+                                span.appendText( content );
+                                editor.insertElement( span );*/
+                                var selection = editor.getSelection(),
+                                        range = selection && selection.getRanges()[0];
+                                if (
+                                        title !== null && contentOpener !== null && separator !== null && contentCloser !== null && // All parts exists
+                                        selection && range && selection.getType() == CKEDITOR.SELECTION_TEXT && !range.collapsed // Selection is valid
+                                )
+                                {
+                                        range.shrink( CKEDITOR.SHRINK_TEXT );
+                                        var     bm = range.createBookmark(),
+                                                temp = new CKEDITOR.dom.element( 'span' );
+                                        // This is a temporary span used to put the caret after the tag ending
+                                        //temp.setStyle( 'display', 'none' );
+                                        temp.setHtml( ' ' );
+
+                                        contentOpener = new CKEDITOR.dom.text( contentOpener );
+                                        separator = new CKEDITOR.dom.text( separator );
+                                        contentCloser = new CKEDITOR.dom.text( contentCloser );
+
+                                        contentOpener.insertBefore( bm.startNode );
+                                        separator.insertAfter( bm.startNode );
+                                        temp.insertAfter( bm.endNode );
+                                        contentCloser.insertAfter( bm.endNode );
+                                        range.moveToBookmark( bm ); // Remove the bookmark
+                                        range.collapse();
+
+                                        // Place the caret after the tag
+                                        range.moveToPosition( temp, CKEDITOR.POSITION_BEFORE_END ); // BEFORE_END works better in IE
+                                        range.select();
+                                        // IE needs this to be executed after a while, but in FF it makes the cursor blink in the wrong place for some time
+                                        if ( CKEDITOR.env.ie )
+                                                setTimeout( function(){ temp.remove(); }, 0 );
+                                        else
+                                                temp.remove();
+                                }
+                                else {
+                                        editor.insertHtml(
+                                                ( contentOpener || '' ) +
+                                                ( separator || '' ) +
+                                                ( title || '' ) +
+                                                ( contentCloser || '' )
+                                        );
+                                }
+
+                                dialog.hide();
+                        });
+                        // Make sure the function is removed when the editor is destoryed
+                        editor.on( 'destroy', function()
+                        {
+                                CKEDITOR.tools.removeFunction( fn );
+                        });
+                        for( var i in siteSettings.slickTagDialog )
+                        {
+                                tab = siteSettings.slickTagDialog[i];
+                                definition = {
+                                        id : 'cke_slicktag_' + i,
+                                        label : tab.label,
+                                        title : tab.label,
+                                        elements : [] //type, label, id, default
+                                };
+                                // Attach the function number to each iframe
+                                for( j in tab.elements )
+                                {
+                                        if( tab.elements[j].type && tab.elements[j].type  == 'iframe' )
+                                                tab.elements[j].src += ( tab.elements[j].src.indexOf( '?' ) == -1 ? '?' : '&' )
+                                                                        + 'slickTagFn=' + fn + '&slickTagEditorId=' + editor.name;
+                                }
+                                definition.elements = tab.elements;
+                                contents.push( definition );
+                        }
+                        CKEDITOR.dialog.add( 'slickTag', function( editor )
+                        {
+                                return {
+                                        title : sitePhrases.slickTag,
+                                        resizable : CKEDITOR.DIALOG_RESIZE_BOTH,
+                                        minWidth : 500,
+                                        minHeight : 400,
+                                        onLoad : function( evt )
+                                        {
+                                                dialog = evt.sender;
+                                        },
+                                        /*onShow: function( evt )
+                                        {
+                                                var frames = dialog.parts.contents.getElementsByTag( 'iframe' );
+                                                for( var i = 0; i < frames.count(); i++ )
+                                                        frames.getItem( i ).getParent().setStyle( 'height', dialog.parts.content.getStyle( 'height' ) );
+                                        },*/
+                                        buttons : [ CKEDITOR.dialog.cancelButton ],
+                                        contents : contents
+                                };
+                        });
+                }
+        });
+}
+ No newline at end of file

_source/plugins/toolbar/plugin.js

@@ -416 +416 @@
  *     ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
  *     ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
  *     ['Link','Unlink','Anchor'],
- *     ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
+ *     ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
  *     '/',
  *     ['Styles','Format','Font','FontSize'],
  *     ['TextColor','BGColor'],
@@ -434 +434 @@
         ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
         ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
         ['Link','Unlink','Anchor'],
-        ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
+        ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
         '/',
         ['Styles','Format','Font','FontSize'],
         ['TextColor','BGColor'],

_source/skins/kama/icons.css

@@ -320 +320 @@
 {
         background-position: 0 -1040px;
 }
-.cke_skin_office2003 .cke_button_editdiv .cke_icon
+
+.cke_skin_kama .cke_button_iframe .cke_icon
 {
-        background-position: 0 -1184px;
+        background-position: 0 -1216px;
 }

_source/skins/office2003/icons.css

@@ -322 +322 @@
 {
         background-position: 0 -1200px;
 }
+.cke_skin_office2003 .cke_button_iframe .cke_icon
+{
+        background-position: 0 -1216px;
+}
+

_source/skins/v2/icons.css

@@ -322 +322 @@
 {
         background-position: 0 -1200px;
 }
+
+.cke_skin_v2 .cke_button_iframe .cke_icon
+{
+        background-position: 0 -1216px;
+}