vanilla ckeditor-3.5

[ckeditor.git] / _source / plugins / link / dialogs / link.js

diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js
index eac5500..5362b16 100644 (file)
--- a/_source/plugins/link/dialogs/link.js
+++ b/_source/plugins/link/dialogs/link.js
@@ -75,6 +75,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
                        else\r
                                element.hide();\r
                }\r
+\r
+               dialog.layout();\r
        };\r
 \r
        // Loads the parameters in a selected link to the link dialog fields.\r
@@ -94,7 +96,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
 \r
        var parseLink = function( editor, element )\r
        {\r
-               var href = ( element  && ( element.getAttribute( '_cke_saved_href' ) || element.getAttribute( 'href' ) ) ) || '',\r
+               var href = ( element  && ( element.data( 'cke-saved-href' ) || element.getAttribute( 'href' ) ) ) || '',\r
                        javascriptMatch,\r
                        emailMatch,\r
                        anchorMatch,\r
@@ -184,7 +186,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                        // IE BUG: target attribute is an empty string instead of null in IE if it's not set.\r
                        if ( !target )\r
                        {\r
-                               var onclick = element.getAttribute( '_cke_pa_onclick' ) || element.getAttribute( 'onclick' ),\r
+                               var onclick = element.data( 'cke-pa-onclick' ) || element.getAttribute( 'onclick' ),\r
                                        onclickMatch = onclick && onclick.match( popupRegex );\r
                                if ( onclickMatch )\r
                                {\r
@@ -242,7 +244,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                for ( var i = 0; i < elements.count() ; i++ )\r
                {\r
                        var item = elements.getItem( i );\r
-                       if ( item.getAttribute( '_cke_realelement' ) && item.getAttribute( '_cke_real_element_type' ) == 'anchor' )\r
+                       if ( item.data( 'cke-realelement' ) && item.data( 'cke-real-element-type' ) == 'anchor' )\r
                                anchors.push( editor.restoreRealElement( item ) );\r
                }\r
 \r
@@ -791,7 +793,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                        },\r
                                        {\r
                                                type : 'vbox',\r
-                                               width : 260,\r
+                                               width : '100%',\r
                                                align : 'center',\r
                                                padding : 2,\r
                                                id : 'popupFeatures',\r
@@ -895,9 +897,9 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                                                                [\r
                                                                                        {\r
                                                                                                type :  'text',\r
-                                                                                               widths : [ '30%', '70%' ],\r
+                                                                                               widths : [ '50%', '50%' ],\r
                                                                                                labelLayout : 'horizontal',\r
-                                                                                               label : linkLang.popupWidth,\r
+                                                                                               label : commonLang.width,\r
                                                                                                id : 'width',\r
                                                                                                setup : setupPopupParams,\r
                                                                                                commit : commitPopupParams\r
@@ -906,7 +908,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                                                                        {\r
                                                                                                type :  'text',\r
                                                                                                labelLayout : 'horizontal',\r
-                                                                                               widths : [ '55%', '45%' ],\r
+                                                                                               widths : [ '50%', '50%' ],\r
                                                                                                label : linkLang.popupLeft,\r
                                                                                                id : 'left',\r
                                                                                                setup : setupPopupParams,\r
@@ -922,8 +924,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                                                                        {\r
                                                                                                type :  'text',\r
                                                                                                labelLayout : 'horizontal',\r
-                                                                                               widths : [ '30%', '70%' ],\r
-                                                                                               label : linkLang.popupHeight,\r
+                                                                                               widths : [ '50%', '50%' ],\r
+                                                                                               label : commonLang.height,\r
                                                                                                id : 'height',\r
                                                                                                setup : setupPopupParams,\r
                                                                                                commit : commitPopupParams\r
@@ -933,7 +935,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                                                                                type :  'text',\r
                                                                                                labelLayout : 'horizontal',\r
                                                                                                label : linkLang.popupTop,\r
-                                                                                               widths : [ '55%', '45%' ],\r
+                                                                                               widths : [ '50%', '50%' ],\r
                                                                                                id : 'top',\r
                                                                                                setup : setupPopupParams,\r
                                                                                                commit : commitPopupParams\r
@@ -1145,8 +1147,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
                        if ( ( element = plugin.getSelectedLink( editor ) ) && element.hasAttribute( 'href' ) )\r
                                selection.selectElement( element );\r
                        else if ( ( element = selection.getSelectedElement() ) && element.is( 'img' )\r
-                                       && element.getAttribute( '_cke_real_element_type' )\r
-                                       && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )\r
+                                       && element.data( 'cke-real-element-type' )\r
+                                       && element.data( 'cke-real-element-type' ) == 'anchor' )\r
                        {\r
                                this.fakeObj = element;\r
                                element = editor.restoreRealElement( this.fakeObj );\r
@@ -1173,12 +1175,12 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                case 'url':\r
                                        var protocol = ( data.url && data.url.protocol != undefined ) ? data.url.protocol : 'http://',\r
                                                url = ( data.url && data.url.url ) || '';\r
-                                       attributes._cke_saved_href = ( url.indexOf( '/' ) === 0 ) ? url : protocol + url;\r
+                                       attributes[ 'data-cke-saved-href' ] = ( url.indexOf( '/' ) === 0 ) ? url : protocol + url;\r
                                        break;\r
                                case 'anchor':\r
                                        var name = ( data.anchor && data.anchor.name ),\r
                                                id = ( data.anchor && data.anchor.id );\r
-                                       attributes._cke_saved_href = '#' + ( name || id || '' );\r
+                                       attributes[ 'data-cke-saved-href' ] = '#' + ( name || id || '' );\r
                                        break;\r
                                case 'email':\r
 \r
@@ -1225,7 +1227,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                                }\r
                                        }\r
 \r
-                                       attributes._cke_saved_href = linkHref.join( '' );\r
+                                       attributes[ 'data-cke-saved-href' ] = linkHref.join( '' );\r
                                        break;\r
                        }\r
 \r
@@ -1253,7 +1255,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                        addFeature( 'top' );\r
 \r
                                        onclickList.push( featureList.join( ',' ), '\'); return false;' );\r
-                                       attributes[ '_cke_pa_onclick' ] = onclickList.join( '' );\r
+                                       attributes[ 'data-cke-pa-onclick' ] = onclickList.join( '' );\r
 \r
                                        // Add the "target" attribute. (#5074)\r
                                        removeAttributes.push( 'target' );\r
@@ -1265,7 +1267,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                        else\r
                                                removeAttributes.push( 'target' );\r
 \r
-                                       removeAttributes.push( '_cke_pa_onclick', 'onclick' );\r
+                                       removeAttributes.push( 'data-cke-pa-onclick', 'onclick' );\r
                                }\r
                        }\r
 \r
@@ -1304,7 +1306,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                {\r
                                        // Short mailto link text view (#5736).\r
                                        var text = new CKEDITOR.dom.text( data.type == 'email' ?\r
-                                                       data.email.address : attributes._cke_saved_href, editor.document );\r
+                                                       data.email.address : attributes[ 'data-cke-saved-href' ], editor.document );\r
                                        ranges[0].insertNode( text );\r
                                        ranges[0].selectNodeContents( text );\r
                                        selection.selectRanges( ranges );\r
@@ -1333,7 +1335,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                        {\r
                                // We're only editing an existing link, so just overwrite the attributes.\r
                                var element = this._.selectedElement,\r
-                                       href = element.getAttribute( '_cke_saved_href' ),\r
+                                       href = element.data( 'cke-saved-href' ),\r
                                        textView = element.getHtml();\r
 \r
                                // IE BUG: Setting the name attribute to an existing link doesn't work.\r
@@ -1360,7 +1362,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                {\r
                                        // Short mailto link text view (#5736).\r
                                        element.setHtml( data.type == 'email' ?\r
-                                               data.email.address : attributes._cke_saved_href );\r
+                                               data.email.address : attributes[ 'data-cke-saved-href' ] );\r
                                }\r
                                // Make the element display as an anchor if a name has been set.\r
                                if ( element.getAttribute( 'name' ) )\r