X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fdialogs%2Flink.js;h=c7388ca639efad04b417e2349785a9e4f68305dc;hp=f904e032c7f3ed49bc55451dea2d54b718342d24;hb=059b4c2fef02528bf1af189f7996e80652faddfb;hpb=c6e377a02b54abc07129d72b632763c727476a15
diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js
index f904e03..c7388ca 100644
--- a/_source/plugins/link/dialogs/link.js
+++ b/_source/plugins/link/dialogs/link.js
@@ -380,7 +380,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
'default' : 'url',
items :
[
- [ editor.lang.common.url, 'url' ],
+ [ editor.lang.link.toUrl, 'url' ],
[ editor.lang.link.toAnchor, 'anchor' ],
[ editor.lang.link.toEmail, 'email' ]
],
@@ -436,6 +436,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
type : 'text',
id : 'url',
label : editor.lang.common.url,
+ required: true,
onLoad : function ()
{
this.allowOnChange = true;
@@ -485,10 +486,6 @@ CKEDITOR.dialog.add( 'link', function( editor )
this.setValue( data.url.url );
this.allowOnChange = true;
- var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
- if ( linkType && linkType.getValue() == 'url' )
- this.select();
-
},
commit : function( data )
{
@@ -528,105 +525,110 @@ CKEDITOR.dialog.add( 'link', function( editor )
children :
[
{
- type : 'html',
+ type : 'fieldset',
id : 'selectAnchorText',
- html : CKEDITOR.tools.htmlEncode( editor.lang.link.selectAnchor ),
+ label : editor.lang.link.selectAnchor,
setup : function( data )
{
if ( data.anchors.length > 0 )
this.getElement().show();
else
this.getElement().hide();
- }
- },
- {
- type : 'html',
- id : 'noAnchors',
- style : 'text-align: center;',
- html : '' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '
',
- setup : function( data )
- {
- if ( data.anchors.length < 1 )
- this.getElement().show();
- else
- this.getElement().hide();
- }
- },
- {
- type : 'hbox',
- id : 'selectAnchor',
+ },
children :
[
{
- type : 'select',
- id : 'anchorName',
- 'default' : '',
- label : editor.lang.link.anchorName,
- style : 'width: 100%;',
- items :
+ type : 'hbox',
+ id : 'selectAnchor',
+ children :
[
- [ '' ]
- ],
- setup : function( data )
- {
- this.clear();
- this.add( '' );
- for ( var i = 0 ; i < data.anchors.length ; i++ )
{
- if ( data.anchors[i].name )
- this.add( data.anchors[i].name );
+ type : 'select',
+ id : 'anchorName',
+ 'default' : '',
+ label : editor.lang.link.anchorName,
+ style : 'width: 100%;',
+ items :
+ [
+ [ '' ]
+ ],
+ setup : function( data )
+ {
+ this.clear();
+ this.add( '' );
+ for ( var i = 0 ; i < data.anchors.length ; i++ )
+ {
+ if ( data.anchors[i].name )
+ this.add( data.anchors[i].name );
+ }
+
+ if ( data.anchor )
+ this.setValue( data.anchor.name );
+
+ var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
+ if ( linkType && linkType.getValue() == 'email' )
+ this.focus();
+ },
+ commit : function( data )
+ {
+ if ( !data.anchor )
+ data.anchor = {};
+
+ data.anchor.name = this.getValue();
+ }
+ },
+ {
+ type : 'select',
+ id : 'anchorId',
+ 'default' : '',
+ label : editor.lang.link.anchorId,
+ style : 'width: 100%;',
+ items :
+ [
+ [ '' ]
+ ],
+ setup : function( data )
+ {
+ this.clear();
+ this.add( '' );
+ for ( var i = 0 ; i < data.anchors.length ; i++ )
+ {
+ if ( data.anchors[i].id )
+ this.add( data.anchors[i].id );
+ }
+
+ if ( data.anchor )
+ this.setValue( data.anchor.id );
+ },
+ commit : function( data )
+ {
+ if ( !data.anchor )
+ data.anchor = {};
+
+ data.anchor.id = this.getValue();
+ }
}
-
- if ( data.anchor )
- this.setValue( data.anchor.name );
-
- var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
- if ( linkType && linkType.getValue() == 'email' )
- this.focus();
- },
- commit : function( data )
- {
- if ( !data.anchor )
- data.anchor = {};
-
- data.anchor.name = this.getValue();
- }
- },
- {
- type : 'select',
- id : 'anchorId',
- 'default' : '',
- label : editor.lang.link.anchorId,
- style : 'width: 100%;',
- items :
- [
- [ '' ]
],
setup : function( data )
{
- this.clear();
- this.add( '' );
- for ( var i = 0 ; i < data.anchors.length ; i++ )
- {
- if ( data.anchors[i].id )
- this.add( data.anchors[i].id );
- }
-
- if ( data.anchor )
- this.setValue( data.anchor.id );
- },
- commit : function( data )
- {
- if ( !data.anchor )
- data.anchor = {};
-
- data.anchor.id = this.getValue();
+ if ( data.anchors.length > 0 )
+ this.getElement().show();
+ else
+ this.getElement().hide();
}
}
- ],
+ ]
+ },
+ {
+ type : 'html',
+ id : 'noAnchors',
+ style : 'text-align: center;',
+ html : '' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '
',
+ // Focus the first element defined in above html.
+ focus : true,
setup : function( data )
{
- if ( data.anchors.length > 0 )
+ if ( data.anchors.length < 1 )
this.getElement().show();
else
this.getElement().hide();
@@ -649,6 +651,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
type : 'text',
id : 'emailAddress',
label : editor.lang.link.emailAddress,
+ required : true,
validate : function()
{
var dialog = this.getDialog();
@@ -736,18 +739,18 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'select',
id : 'linkTargetType',
- label : editor.lang.link.target,
+ label : editor.lang.common.target,
'default' : 'notSet',
style : 'width : 100%;',
'items' :
[
- [ editor.lang.link.targetNotSet, 'notSet' ],
+ [ editor.lang.common.notSet, 'notSet' ],
[ editor.lang.link.targetFrame, 'frame' ],
[ editor.lang.link.targetPopup, 'popup' ],
- [ editor.lang.link.targetNew, '_blank' ],
- [ editor.lang.link.targetTop, '_top' ],
- [ editor.lang.link.targetSelf, '_self' ],
- [ editor.lang.link.targetParent, '_parent' ]
+ [ editor.lang.common.targetNew, '_blank' ],
+ [ editor.lang.common.targetTop, '_top' ],
+ [ editor.lang.common.targetSelf, '_self' ],
+ [ editor.lang.common.targetParent, '_parent' ]
],
onChange : targetChanged,
setup : function( data )
@@ -792,145 +795,148 @@ CKEDITOR.dialog.add( 'link', function( editor )
children :
[
{
- type : 'html',
- html : CKEDITOR.tools.htmlEncode( editor.lang.link.popupFeatures )
- },
- {
- type : 'hbox',
+ type : 'fieldset',
+ label : editor.lang.link.popupFeatures,
children :
[
{
- type : 'checkbox',
- id : 'resizable',
- label : editor.lang.link.popupResizable,
- setup : setupPopupParams,
- commit : commitPopupParams
- },
- {
- type : 'checkbox',
- id : 'status',
- label : editor.lang.link.popupStatusBar,
- setup : setupPopupParams,
- commit : commitPopupParams
-
- }
- ]
- },
- {
- type : 'hbox',
- children :
- [
- {
- type : 'checkbox',
- id : 'location',
- label : editor.lang.link.popupLocationBar,
- setup : setupPopupParams,
- commit : commitPopupParams
+ type : 'hbox',
+ children :
+ [
+ {
+ type : 'checkbox',
+ id : 'resizable',
+ label : editor.lang.link.popupResizable,
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ },
+ {
+ type : 'checkbox',
+ id : 'status',
+ label : editor.lang.link.popupStatusBar,
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ }
+ ]
},
{
- type : 'checkbox',
- id : 'toolbar',
- label : editor.lang.link.popupToolbar,
- setup : setupPopupParams,
- commit : commitPopupParams
+ type : 'hbox',
+ children :
+ [
+ {
+ type : 'checkbox',
+ id : 'location',
+ label : editor.lang.link.popupLocationBar,
+ setup : setupPopupParams,
+ commit : commitPopupParams
- }
- ]
- },
- {
- type : 'hbox',
- children :
- [
- {
- type : 'checkbox',
- id : 'menubar',
- label : editor.lang.link.popupMenuBar,
- setup : setupPopupParams,
- commit : commitPopupParams
+ },
+ {
+ type : 'checkbox',
+ id : 'toolbar',
+ label : editor.lang.link.popupToolbar,
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ }
+ ]
},
{
- type : 'checkbox',
- id : 'fullscreen',
- label : editor.lang.link.popupFullScreen,
- setup : setupPopupParams,
- commit : commitPopupParams
+ type : 'hbox',
+ children :
+ [
+ {
+ type : 'checkbox',
+ id : 'menubar',
+ label : editor.lang.link.popupMenuBar,
+ setup : setupPopupParams,
+ commit : commitPopupParams
- }
- ]
- },
- {
- type : 'hbox',
- children :
- [
- {
- type : 'checkbox',
- id : 'scrollbars',
- label : editor.lang.link.popupScrollBars,
- setup : setupPopupParams,
- commit : commitPopupParams
+ },
+ {
+ type : 'checkbox',
+ id : 'fullscreen',
+ label : editor.lang.link.popupFullScreen,
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ }
+ ]
},
{
- type : 'checkbox',
- id : 'dependent',
- label : editor.lang.link.popupDependent,
- setup : setupPopupParams,
- commit : commitPopupParams
+ type : 'hbox',
+ children :
+ [
+ {
+ type : 'checkbox',
+ id : 'scrollbars',
+ label : editor.lang.link.popupScrollBars,
+ setup : setupPopupParams,
+ commit : commitPopupParams
- }
- ]
- },
- {
- type : 'hbox',
- children :
- [
- {
- type : 'text',
- widths : [ '30%', '70%' ],
- labelLayout : 'horizontal',
- label : editor.lang.link.popupWidth,
- id : 'width',
- setup : setupPopupParams,
- commit : commitPopupParams
+ },
+ {
+ type : 'checkbox',
+ id : 'dependent',
+ label : editor.lang.link.popupDependent,
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ }
+ ]
},
{
- type : 'text',
- labelLayout : 'horizontal',
- widths : [ '55%', '45%' ],
- label : editor.lang.link.popupLeft,
- id : 'left',
- setup : setupPopupParams,
- commit : commitPopupParams
-
- }
- ]
- },
- {
- type : 'hbox',
- children :
- [
- {
- type : 'text',
- labelLayout : 'horizontal',
- widths : [ '30%', '70%' ],
- label : editor.lang.link.popupHeight,
- id : 'height',
- setup : setupPopupParams,
- commit : commitPopupParams
+ type : 'hbox',
+ children :
+ [
+ {
+ type : 'text',
+ widths : [ '30%', '70%' ],
+ labelLayout : 'horizontal',
+ label : editor.lang.link.popupWidth,
+ id : 'width',
+ setup : setupPopupParams,
+ commit : commitPopupParams
+
+ },
+ {
+ type : 'text',
+ labelLayout : 'horizontal',
+ widths : [ '55%', '45%' ],
+ label : editor.lang.link.popupLeft,
+ id : 'left',
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ }
+ ]
},
{
- type : 'text',
- labelLayout : 'horizontal',
- label : editor.lang.link.popupTop,
- widths : [ '55%', '45%' ],
- id : 'top',
- setup : setupPopupParams,
- commit : commitPopupParams
+ type : 'hbox',
+ children :
+ [
+ {
+ type : 'text',
+ labelLayout : 'horizontal',
+ widths : [ '30%', '70%' ],
+ label : editor.lang.link.popupHeight,
+ id : 'height',
+ setup : setupPopupParams,
+ commit : commitPopupParams
+
+ },
+ {
+ type : 'text',
+ labelLayout : 'horizontal',
+ label : editor.lang.link.popupTop,
+ widths : [ '55%', '45%' ],
+ id : 'top',
+ setup : setupPopupParams,
+ commit : commitPopupParams
+ }
+ ]
}
]
}
@@ -993,7 +999,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
style : 'width:110px',
items :
[
- [ editor.lang.link.langDirNotSet, '' ],
+ [ editor.lang.common.notSet, '' ],
[ editor.lang.link.langDirLTR, 'ltr' ],
[ editor.lang.link.langDirRTL, 'rtl' ]
],
@@ -1373,6 +1379,17 @@ CKEDITOR.dialog.add( 'link', function( editor )
if ( !editor.config.linkShowTargetTab )
this.hidePage( 'target' ); //Hide Target tab.
+ },
+ // Inital focus on 'url' field if link is of type URL.
+ onFocus : function()
+ {
+ var linkType = this.getContentElement( 'info', 'linkType' ),
+ urlField;
+ if ( linkType && linkType.getValue( ) == 'url' )
+ {
+ urlField = this.getContentElement( 'info', 'url' );
+ urlField.select();
+ }
}
};
});