' );
Index: /CKEditor/trunk/_source/plugins/contextmenu/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/contextmenu/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/contextmenu/plugin.js (revision 3308)
@@ -119,5 +119,5 @@
domEvent.preventDefault();
- var offsetParent = domEvent.getTarget().getDocument().getDocumentElement();
+ var offsetParent = domEvent.getTarget().getDocument().getDocumentElement(),
offsetX = domEvent.$.clientX,
offsetY = domEvent.$.clientY;
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 3308)
@@ -300,5 +300,5 @@
{
// Arrow keys - used for changing tabs.
- var nextId = ( keystroke == 37 ? getPreviousVisibleTab.call( me ) : getNextVisibleTab.call( me ) );
+ nextId = ( keystroke == 37 ? getPreviousVisibleTab.call( me ) : getNextVisibleTab.call( me ) );
me.selectPage( nextId );
me._.tabs[ nextId ][ 0 ].focus();
@@ -359,5 +359,5 @@
// Insert the tabs and contents.
- for ( i = 0 ; i < definition.contents.length ; i++ )
+ for ( var i = 0 ; i < definition.contents.length ; i++ )
this.addPage( definition.contents[i] );
@@ -373,5 +373,5 @@
// Find the outer container of the tab.
- var id = target.$.id.substr( 0, target.$.id.lastIndexOf( '_' ) );
+ id = target.$.id.substr( 0, target.$.id.lastIndexOf( '_' ) );
this.selectPage( id );
Index: /CKEditor/trunk/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3308)
@@ -777,4 +777,5 @@
return this.fire( 'click', { dialog : this._.dialog } );
this.getElement().$.blur();
+ return false;
},
Index: /CKEditor/trunk/_source/plugins/domiterator/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/domiterator/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/domiterator/plugin.js (revision 3308)
@@ -129,5 +129,5 @@
if ( nodeName == 'br' )
includeNode = true;
- else if ( !range && currentNode.getChildCount() == 0 && nodeName != 'hr' )
+ else if ( !range && !currentNode.getChildCount() && nodeName != 'hr' )
{
// If we have found an empty block, and haven't started
@@ -246,6 +246,6 @@
}
- var startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
- startBlockLimit = startPath.blockLimit,
+ startPath = new CKEDITOR.dom.elementPath( range.startContainer );
+ var startBlockLimit = startPath.blockLimit,
checkLimits = { div : 1, th : 1, td : 1 };
block = startPath.block;
Index: /CKEditor/trunk/_source/plugins/enterkey/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/enterkey/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/enterkey/plugin.js (revision 3308)
@@ -34,5 +34,5 @@
// Only effective within document.
if ( editor.mode != 'wysiwyg' )
- return;
+ return false;
if ( !mode )
@@ -220,5 +220,8 @@
if ( !forceMode && startBlockTag == 'li' )
- return enterBlock( editor, mode, range );
+ {
+ enterBlock( editor, mode, range );
+ return;
+ }
// If we are at the end of a header block.
Index: /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js (revision 3308)
@@ -12,5 +12,5 @@
$ : function( element )
{
- var realHtml = element.attributes._cke_realelement;
+ var realHtml = element.attributes._cke_realelement,
realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realHtml ) ),
realElement = realFragment && realFragment.children[ 0 ];
Index: /CKEditor/trunk/_source/plugins/find/dialogs/find.js
===================================================================
--- /CKEditor/trunk/_source/plugins/find/dialogs/find.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/find/dialogs/find.js (revision 3308)
@@ -58,7 +58,7 @@
for ( i = 0 ; i < l ; i++ )
{
- var sourceField = this.getContentElement( pages[ sourceIndex ],
+ sourceField = this.getContentElement( pages[ sourceIndex ],
fieldsMapping[ i ][ sourceIndex ] );
- var targetField = this.getContentElement( pages[ targetIndex ],
+ targetField = this.getContentElement( pages[ targetIndex ],
fieldsMapping[ i ][ targetIndex ] );
@@ -92,5 +92,5 @@
{
// Already at the end of document, no more character available.
- if( this.textNode == null )
+ if( !this.textNode )
return cursorStep.call( this );
@@ -219,5 +219,7 @@
if ( endNode.getLength() < 1 )
{
- while ( ( endNode = endNode.getPreviousSourceNode() ) && !( endNode.type == CKEDITOR.NODE_TEXT && endNode.getLength() > 0 ) );
+ while ( ( endNode = endNode.getPreviousSourceNode() ) && !( endNode.type == CKEDITOR.NODE_TEXT && endNode.getLength() > 0 ) )
+ { /*jsl:pass*/ }
+
endIndex = endNode.getLength();
}
@@ -289,5 +291,5 @@
removeHighlight : function()
{
- if ( this._.highlightRange == null )
+ if ( !this._.highlightRange )
return;
@@ -400,5 +402,5 @@
return KMP_ADVANCED;
}
- else if ( this._.state == 0 )
+ else if ( !this._.state )
return KMP_NOMATCH;
else
@@ -445,5 +447,5 @@
character = '%';
- while ( character != null )
+ while ( character !== null )
{
this.range.moveNext();
@@ -807,12 +809,12 @@
};
- CKEDITOR.dialog.add( 'find', function( editor ){
- return findDialog( editor, 'find' )
- }
- );
-
- CKEDITOR.dialog.add( 'replace', function( editor ){
- return findDialog( editor, 'replace' )
- }
- );
+ CKEDITOR.dialog.add( 'find', function( editor )
+ {
+ return findDialog( editor, 'find' );
+ });
+
+ CKEDITOR.dialog.add( 'replace', function( editor )
+ {
+ return findDialog( editor, 'replace' );
+ });
})();
Index: /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js
===================================================================
--- /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js (revision 3308)
@@ -47,5 +47,5 @@
attributesMap[ names[i] ] = [ { type : ATTRTYPE_EMBED, name : names[i] }, { type : ATTRTYPE_PARAM, name : names[i] } ];
names = [ 'allowFullScreen', 'play', 'loop', 'menu' ];
- for ( var i = 0 ; i < names.length ; i++ )
+ for ( i = 0 ; i < names.length ; i++ )
attributesMap[ names[i] ][0]['default'] = attributesMap[ names[i] ][1]['default'] = true;
@@ -65,5 +65,5 @@
if ( !objectNode )
continue;
- if ( objectNode.getAttribute( attrDef.name ) != null )
+ if ( objectNode.getAttribute( attrDef.name ) !== null )
{
var value = objectNode.getAttribute( attrDef.name );
@@ -81,5 +81,5 @@
if ( attrDef.name in paramMap )
{
- var value = paramMap[ attrDef.name ];
+ value = paramMap[ attrDef.name ];
if ( isCheckbox )
this.setValue( value.toLowerCase() == 'true' );
@@ -93,7 +93,7 @@
if ( !embedNode )
continue;
- if ( embedNode.getAttribute( attrDef.name ) != null )
- {
- var value = embedNode.getAttribute( attrDef.name );
+ if ( embedNode.getAttribute( attrDef.name ) )
+ {
+ value = embedNode.getAttribute( attrDef.name );
if ( isCheckbox )
this.setValue( value.toLowerCase() == 'true' );
@@ -104,5 +104,4 @@
else if ( isCheckbox )
this.setValue( !!attrDef[ 'default' ] );
- default:
}
}
@@ -135,5 +134,5 @@
if ( !objectNode )
continue;
- var value = this.getValue();
+ value = this.getValue();
if ( isRemove || isCheckbox && value === attrDef[ 'default' ] )
{
@@ -159,10 +158,9 @@
if ( !embedNode )
continue;
- var value = this.getValue();
+ value = this.getValue();
if ( isRemove || isCheckbox && value === attrDef[ 'default' ])
embedNode.removeAttribute( attrDef.name );
else
embedNode.setAttribute( attrDef.name, value );
- default:
}
}
@@ -184,8 +182,8 @@
onLoad : function()
{
- if ( editor.config.flashUploadTab == false )
+ if ( !editor.config.flashUploadTab )
this.hidePage( 'Upload' ); // Hide Upload tab.
- if ( editor.config.flashBrowseServer == false )
+ if ( !editor.config.flashBrowseServer )
this.getContentElement( 'info', 'browse' ).getElement().hide();
},
@@ -361,5 +359,5 @@
{
commitValue.apply( this, arguments );
- if ( this.getValue() != '' )
+ if ( this.getValue() )
extraStyles.width = this.getValue() + 'px';
}
@@ -383,5 +381,5 @@
{
commitValue.apply( this, arguments );
- if ( this.getValue() != '' )
+ if ( this.getValue() )
extraStyles.height = this.getValue() + 'px';
}
@@ -523,5 +521,5 @@
setup : loadValue,
commit : commitValue
- },
+ }
]
},
Index: /CKEditor/trunk/_source/plugins/flash/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/flash/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/flash/plugin.js (revision 3308)
@@ -113,10 +113,10 @@
{
if ( !isFlashEmbed( element.children[ i ] ) )
- return;
+ return null;
return createFakeElement( editor, element );
}
}
- return;
+ return null;
}
@@ -127,5 +127,5 @@
{
if ( !isFlashEmbed( element ) )
- return;
+ return null;
return createFakeElement( editor, element );
Index: /CKEditor/trunk/_source/plugins/floatpanel/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/floatpanel/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/floatpanel/plugin.js (revision 3308)
@@ -64,5 +64,5 @@
children : [],
dir : editor.lang.dir
- }
+ };
},
Index: /CKEditor/trunk/_source/plugins/font/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/font/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/font/plugin.js (revision 3308)
@@ -63,5 +63,5 @@
}
- var style = styles[ value ]
+ var style = styles[ value ];
if ( this.getValue() == value )
@@ -147,5 +147,5 @@
'Verdana/Verdana, Geneva, sans-serif';
-CKEDITOR.config.font_defaultLabel = ''
+CKEDITOR.config.font_defaultLabel = '';
CKEDITOR.config.font_style =
{
@@ -160,5 +160,5 @@
'8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px';
-CKEDITOR.config.fontSize_defaultLabel = ''
+CKEDITOR.config.fontSize_defaultLabel = '';
CKEDITOR.config.fontSize_style =
{
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/button.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/button.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/button.js (revision 3308)
@@ -64,5 +64,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -80,5 +80,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'value', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/checkbox.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/checkbox.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/checkbox.js (revision 3308)
@@ -65,5 +65,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -81,5 +81,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'value', this.getValue() );
}
@@ -98,5 +98,5 @@
commit : function( element )
{
- if ( this.getValue() == true || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'checked', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/form.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/form.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/form.js (revision 3308)
@@ -62,5 +62,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -78,5 +78,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'action', this.getValue() );
}
@@ -99,5 +99,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'id', this.getValue() );
}
@@ -123,5 +123,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'encoding', this.getValue() );
}
@@ -155,5 +155,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'target', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/hiddenfield.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/hiddenfield.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/hiddenfield.js (revision 3308)
@@ -62,5 +62,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -78,5 +78,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'value', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/radio.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/radio.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/radio.js (revision 3308)
@@ -62,5 +62,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -78,5 +78,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'value', this.getValue() );
}
@@ -95,5 +95,5 @@
commit : function( element )
{
- if ( this.getValue() == true || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'checked', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/select.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/select.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/select.js (revision 3308)
@@ -28,5 +28,5 @@
else
{
- if ( index != null && index < combo.getChildCount() )
+ if ( index !== null && index < combo.getChildCount() )
combo.getChild( index < 0 ? 0 : index ).insertBeforeMe( oOption );
else
@@ -74,5 +74,6 @@
{
combo = getSelect( combo );
- while( combo.getChild( 0 ) && combo.getChild( 0 ).remove() );
+ while( combo.getChild( 0 ) && combo.getChild( 0 ).remove() )
+ { /*jsl:pass*/ }
}
// Moves the selected option by a number of steps (also negative).
@@ -110,5 +111,5 @@
combo = getSelect( combo );
if ( index < 0 )
- return ;
+ return null;
var count = combo.getChildren().count();
combo.$.selectedIndex = ( index >= count ) ? ( count - 1 ) : index;
@@ -196,5 +197,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -229,5 +230,5 @@
{
var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
- return ( ( this.getValue() == '' ) || func.apply( this ) );
+ return ( ( this.getValue() === '' ) || func.apply( this ) );
},
setup : function( name, element )
@@ -238,5 +239,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'size', this.getValue() );
}
@@ -371,5 +372,5 @@
}
}
- },
+ }
]
},
@@ -388,5 +389,5 @@
{
//Add new option.
- var dialog = this.getDialog();
+ var dialog = this.getDialog(),
parentEditor = dialog.getParentEditor(),
optName = dialog.getContentElement( 'info', 'txtOptName' ),
@@ -410,5 +411,5 @@
{
//Modify selected option.
- var dialog = this.getDialog();
+ var dialog = this.getDialog(),
optName = dialog.getContentElement( 'info', 'txtOptName' ),
optValue = dialog.getContentElement( 'info', 'txtOptValue' ),
@@ -512,5 +513,5 @@
commit : function( element )
{
- if ( this.getValue() == true || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'multiple', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/textarea.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/textarea.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/textarea.js (revision 3308)
@@ -61,5 +61,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -83,5 +83,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'cols', this.getValue() );
}
@@ -105,5 +105,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'rows', this.getValue() );
}
Index: /CKEditor/trunk/_source/plugins/forms/dialogs/textfield.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/dialogs/textfield.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/forms/dialogs/textfield.js (revision 3308)
@@ -67,5 +67,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'name', this.getValue() );
}
@@ -83,5 +83,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'value', this.getValue() );
}
@@ -104,5 +104,5 @@
{
var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
- return isValid = func.apply( this );
+ return func.apply( this );
},
setup : function( element )
@@ -112,5 +112,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'size', this.getValue() );
}
@@ -126,5 +126,5 @@
{
var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
- return isValid = func.apply( this );
+ return func.apply( this );
},
setup : function( element )
@@ -134,5 +134,5 @@
commit : function( element )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'maxlength', this.getValue() );
}
@@ -149,5 +149,5 @@
[
[ editor.lang.textfield.typeText, 'text' ],
- [ editor.lang.textfield.typePass, 'pass' ],
+ [ editor.lang.textfield.typePass, 'pass' ]
],
setup : function( element )
Index: /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 3308)
@@ -11,5 +11,5 @@
[
// Elements that cause problems in wysiwyg mode.
- [ /^(object|embed|param)$/, 'cke:$1' ]
+ [ ( /^(object|embed|param)$/ ), 'cke:$1' ]
],
@@ -18,5 +18,5 @@
// Event attributes (onXYZ) must not be directly set. They can become
// active in the editing area (IE|WebKit).
- [ /^on/, '_cke_pa_on' ]
+ [ ( /^on/ ), '_cke_pa_on' ]
]
};
@@ -27,8 +27,8 @@
[
// Remove the "cke:" namespace prefix.
- [ /^cke:/, '' ],
+ [ ( /^cke:/ ), '' ],
// Ignore tags.
- [ /^\?xml:namespace$/, '' ]
+ [ ( /^\?xml:namespace$/ ), '' ]
],
@@ -36,8 +36,8 @@
[
// Attributes saved for changes and protected attributes.
- [ /^_cke_(saved|pa)_/, '' ],
+ [ ( /^_cke_(saved|pa)_/ ), '' ],
// All "_cke" attributes are to be ignored.
- [ /^_cke.*/, '' ]
+ [ ( /^_cke.*/ ), '' ]
],
@@ -91,5 +91,5 @@
{
return value.toLowerCase();
- }
+ };
}
@@ -99,5 +99,5 @@
{
return html.replace( protectUrlTagRegex, '$& _cke_saved_$1' );
- };
+ }
CKEDITOR.plugins.add( 'htmldataprocessor',
Index: /CKEditor/trunk/_source/plugins/iframedialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/iframedialog/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/iframedialog/plugin.js (revision 3308)
@@ -21,5 +21,6 @@
width : '100%',
height : '100%'
- }
+ };
+
if ( typeof( onContentLoad ) == 'function' )
element.onContentLoad = onContentLoad;
Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 3308)
@@ -34,5 +34,5 @@
if ( this.id == 'txtHeight' )
{
- if ( value != '' && value != 0 )
+ if ( value && value != '0' )
value = Math.round( oImageOriginal.$.width * ( value / oImageOriginal.$.height ) );
if ( !isNaN( value ) )
@@ -41,5 +41,5 @@
else //this.id = txtWidth.
{
- if ( value != '' && value != 0 )
+ if ( value && value != '0' )
value = Math.round( oImageOriginal.$.height * ( value / oImageOriginal.$.width ) );
if ( !isNaN( value ) )
@@ -77,12 +77,14 @@
dialog.lockRatio = false; // Default: unlock ratio
- if ( width == 0 && height == 0 )
+ if ( !width && !height )
dialog.lockRatio = true;
- else if ( !isNaN( originalRatio ) && !isNaN( thisRatio ))
+ else if ( !isNaN( originalRatio ) && !isNaN( thisRatio ) )
+ {
if ( Math.round( originalRatio ) == Math.round( thisRatio ) )
dialog.lockRatio = true;
+ }
}
else if ( value != undefined )
- dialog.lockRatio = value
+ dialog.lockRatio = value;
else
dialog.lockRatio = !dialog.lockRatio;
@@ -113,7 +115,7 @@
{
if ( type != IMAGE )
- return 0;
-
- var checkDimension = function( size, defaultValue )
+ return;
+
+ function checkDimension( size, defaultValue )
{
var aMatch = size.match( regexGetSize );
@@ -128,6 +130,7 @@
}
return defaultValue;
- },
- dialog = this.getDialog(),
+ }
+
+ var dialog = this.getDialog(),
value = '',
dimension = (( this.id == 'txtWidth' )? 'width' : 'height' ),
@@ -156,5 +159,5 @@
// New image -> new domensions
- if ( this.dontResetSize == false )
+ if ( !this.dontResetSize )
resetSize( this );
@@ -299,5 +302,5 @@
// Create a new link.
- if ( this.linkEditMode == false )
+ if ( !this.linkEditMode )
this.linkElement = editor.document.createElement( 'a' );
@@ -310,5 +313,5 @@
// Insert a new Image.
- if ( this.imageEditMode == false )
+ if ( !this.imageEditMode )
{
// It doesn't work with IE.
@@ -317,6 +320,7 @@
if ( this.addLink )
+ {
//Insert a new Link.
- if ( this.linkEditMode == false )
+ if ( !this.linkEditMode )
{
this.linkElement.append( this.imageElement, false );
@@ -325,4 +329,5 @@
else //Link already exists, image not.
this.linkElement.append( this.imageElement, false );
+ }
else
editor.insertElement( this.imageElement );
@@ -331,5 +336,5 @@
{
//Add a new link element.
- if ( this.linkEditMode == false && this.addLink )
+ if ( !this.linkEditMode && this.addLink )
{
this.imageElement.insertBeforeMe( this.linkElement );
@@ -337,5 +342,5 @@
}
//Remove Link, Image exists.
- else if ( this.linkEditMode == true && this.addLink == false )
+ else if ( this.linkEditMode && !this.addLink )
this.linkElement.remove( true );
}
@@ -394,6 +399,6 @@
if ( newUrl.length > 0 ) //Prevent from load before onShow
{
- var dialog = this.getDialog(),
- original = dialog.originalElement;
+ dialog = this.getDialog();
+ var original = dialog.originalElement;
original.setCustomData( 'isReady', 'false' );
@@ -427,5 +432,5 @@
commit : function( type, element )
{
- if ( type == IMAGE && ( this.getValue() != '' || this.isChanged() ) )
+ if ( type == IMAGE && ( this.getValue() || this.isChanged() ) )
{
element.setAttribute( '_cke_saved_src', decodeURI( this.getValue() ) );
@@ -447,5 +452,5 @@
{
var dialog = this.getDialog();
- if ( dialog.getParentEditor().config.image_browseServer == false )
+ if ( !dialog.getParentEditor().config.image_browseServer )
dialog.getContentElement( 'info', 'browse' ).getElement().hide();
},
@@ -478,5 +483,5 @@
if ( type == IMAGE )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'alt', this.getValue() );
}
@@ -530,13 +535,13 @@
{
var value = this.getValue();
- if ( value != '' )
+ if ( value )
element.setAttribute( 'width', value );
- else if ( value == '' && this.isChanged() )
+ else if ( !value && this.isChanged() )
element.removeAttribute( 'width' );
}
else if ( type == PREVIEW )
{
- var value = this.getValue(),
- aMatch = value.match( regexGetSize );
+ value = this.getValue();
+ var aMatch = value.match( regexGetSize );
if ( !aMatch )
{
@@ -575,13 +580,13 @@
{
var value = this.getValue();
- if ( value != '' )
+ if ( value )
element.setAttribute( 'height', value );
- else if ( value == '' && this.isChanged() )
+ else if ( !value && this.isChanged() )
element.removeAttribute( 'height' );
}
else if ( type == PREVIEW )
{
- var value = this.getValue(),
- aMatch = value.match( regexGetSize );
+ value = this.getValue();
+ var aMatch = value.match( regexGetSize );
if ( !aMatch )
{
@@ -609,5 +614,5 @@
{
// Activate Reset button
- var resetButton = CKEDITOR.document.getById( 'btnResetSize' );
+ var resetButton = CKEDITOR.document.getById( 'btnResetSize' ),
ratioButton = CKEDITOR.document.getById( 'btnLockSizes' );
if ( resetButton )
@@ -693,5 +698,5 @@
if ( type == IMAGE )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'border', this.getValue() );
}
@@ -738,5 +743,5 @@
if ( type == IMAGE )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'hspace', this.getValue() );
}
@@ -781,5 +786,5 @@
if ( type == IMAGE )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'vspace', this.getValue() );
}
@@ -835,5 +840,5 @@
if ( type == IMAGE )
{
- if ( value != '' || this.isChanged() )
+ if ( value || this.isChanged() )
element.setAttribute( 'align', value );
}
@@ -913,5 +918,6 @@
{
if ( type == LINK )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
{
element.setAttribute( '_cke_saved_href', decodeURI( this.getValue() ) );
@@ -919,7 +925,8 @@
CKEDITOR.tools.getNextNumber() + '*/' );
- if ( this.getValue() != '' || editor.config.image_removeLinkByEmptyURL == false )
+ if ( this.getValue() || !editor.config.image_removeLinkByEmptyURL )
this.getDialog().addLink = true;
}
+ }
}
},
@@ -954,6 +961,8 @@
{
if ( type == LINK )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'target', this.getValue() );
+ }
}
}
@@ -1002,6 +1011,8 @@
{
if ( type == IMAGE )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'id', this.getValue() );
+ }
}
},
@@ -1026,6 +1037,8 @@
{
if ( type == IMAGE )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'dir', this.getValue() );
+ }
}
},
@@ -1043,6 +1056,8 @@
{
if ( type == IMAGE )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'lang', this.getValue() );
+ }
}
}
@@ -1061,6 +1076,8 @@
{
if ( type == IMAGE )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'longDesc', this.getValue() );
+ }
}
},
@@ -1083,6 +1100,8 @@
{
if ( type == IMAGE )
- if ( this.getValue() != '' || this.isChanged() )
+ {
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'class', this.getValue() );
+ }
}
},
@@ -1105,5 +1124,5 @@
if ( type == IMAGE )
{
- if ( this.getValue() != '' || this.isChanged() )
+ if ( this.getValue() || this.isChanged() )
element.setAttribute( 'title', this.getValue() );
}
@@ -1143,20 +1162,20 @@
height : !!aMatchH,
width : !!aMatchW
- }
+ };
}
},
commit : function( type, element )
{
- if ( type == IMAGE && ( this.getValue() != '' || this.isChanged() ) )
+ if ( type == IMAGE && ( this.getValue() || this.isChanged() ) )
{
element.setAttribute( 'style', this.getValue() );
// Set STYLE dimensions.
- var height = element.getAttribute( 'height' );
+ var height = element.getAttribute( 'height' ),
width = element.getAttribute( 'width' );
if ( this.attributesInStyle && this.attributesInStyle.height )
{
- if ( height && height != '' )
+ if ( height )
{
if ( height.match( regexGetSize )[2] == '%' ) // % is allowed
@@ -1170,9 +1189,11 @@
if ( this.attributesInStyle && this.attributesInStyle.width )
{
- if ( width && width != '' )
+ if ( width )
+ {
if ( width.match( regexGetSize )[2] == '%' ) // % is allowed
element.setStyle( 'width', width + '%' );
else
element.setStyle( 'width', width + 'px' );
+ }
else
element.removeStyle( 'width' );
@@ -1189,12 +1210,10 @@
CKEDITOR.dialog.add( 'image', function( editor )
{
- return imageDialog( editor, 'image' )
- }
- );
+ return imageDialog( editor, 'image' );
+ });
CKEDITOR.dialog.add( 'imagebutton', function( editor )
{
- return imageDialog( editor, 'imagebutton' )
- }
- );
+ return imageDialog( editor, 'imagebutton' );
+ });
})();
Index: /CKEditor/trunk/_source/plugins/image/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/image/plugin.js (revision 3308)
@@ -47,5 +47,5 @@
{
if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) )
- return;
+ return null;
return { image : CKEDITOR.TRISTATE_OFF };
Index: /CKEditor/trunk/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/indent/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/indent/plugin.js (revision 3308)
@@ -64,10 +64,10 @@
var indentClass = firstBlock.$.className.match( this.classNameRegex ),
indentStep = 0;
- if ( indentClass != null )
+ if ( indentClass )
{
indentClass = indentClass[1];
indentStep = this.indentClassMap[ indentClass ];
}
- if ( ( this.name == 'outdent' && indentStep == 0 ) ||
+ if ( ( this.name == 'outdent' && !indentStep ) ||
( this.name == 'indent' && indentStep == editor.config.indentClass.length ) )
return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
@@ -103,5 +103,5 @@
itemsToMove = [],
stopFlag = false;
- while ( stopFlag == false )
+ while ( !stopFlag )
{
if ( block.equals( endContainer ) )
@@ -136,7 +136,7 @@
// Apply indenting or outdenting on the array.
var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;
- for ( var i = startItem.getCustomData( 'listarray_index' ) ; i <= lastItem.getCustomData( 'listarray_index' ) ; i++ )
+ for ( i = startItem.getCustomData( 'listarray_index' ) ; i <= lastItem.getCustomData( 'listarray_index' ) ; i++ )
listArray[i].indent += indentOffset;
- for ( var i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
+ for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
i < listArray.length && listArray[i].indent > baseIndent ; i++ )
listArray[i].indent += indentOffset;
@@ -174,5 +174,5 @@
var indentClass = block.$.className.match( this.classNameRegex ),
indentStep = 0;
- if ( indentClass != null )
+ if ( indentClass )
{
indentClass = indentClass[1];
@@ -203,5 +203,5 @@
currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
block.setStyle( this.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
- if ( block.getAttribute( 'style' ) == '' )
+ if ( block.getAttribute( 'style' ) === '' )
block.removeAttribute( 'style' );
}
Index: /CKEditor/trunk/_source/plugins/justify/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/justify/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/justify/plugin.js (revision 3308)
@@ -91,5 +91,5 @@
if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
block.addClass( cssClassName );
- else if ( className.length == 0 )
+ else if ( !className )
block.removeAttribute( 'class' );
}
Index: /CKEditor/trunk/_source/plugins/link/dialogs/anchor.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/dialogs/anchor.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/link/dialogs/anchor.js (revision 3308)
@@ -14,8 +14,8 @@
var attributeValue = this.editObj.getAttribute( 'name' );
- if ( attributeValue == null )
+ if ( attributeValue )
+ this.setValueOf( 'info','txtName', attributeValue );
+ else
this.setValueOf( 'info','txtName', "" );
- else
- this.setValueOf( 'info','txtName', attributeValue );
};
@@ -72,5 +72,5 @@
{
ranges[0].enlarge( CKEDITOR.ENLARGE_ELEMENT );
- rangeRoot = ranges[0].getCommonAncestor( true );
+ var rangeRoot = ranges[0].getCommonAncestor( true );
var element = rangeRoot.getAscendant( 'img', true );
if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
@@ -98,5 +98,5 @@
validate : function()
{
- if ( this.getValue() == '' )
+ if ( !this.getValue() )
{
alert( editor.lang.anchor.errorName );
@@ -105,5 +105,5 @@
return true;
}
- },
+ }
]
}
Index: /CKEditor/trunk/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 3308)
@@ -85,5 +85,5 @@
retval = {};
- if ( href != null )
+ if ( href )
{
emailMatch = href.match( emailRegex );
@@ -162,5 +162,5 @@
{
var value = element.getAttribute( attrName );
- if ( value != null )
+ if ( value !== null )
retval.adv[ inputName ] = value || '';
};
@@ -193,7 +193,7 @@
}
}
- for ( var i = 0 ; i < realAnchors.length ; i++ )
+ for ( i = 0 ; i < realAnchors.length ; i++ )
anchors.push( realAnchors[i] );
- for ( var i = 0, item, length = anchors.length ; i < length && ( item = anchors.shift() ) ; i++ )
+ for ( i = 0, length = anchors.length ; i < length && ( item = anchors.shift() ) ; i++ )
anchors.push( { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) } );
@@ -348,5 +348,5 @@
return true;
- if ( this.getDialog().fakeObj != false ) // Edit Anchor.
+ if ( this.getDialog().fakeObj ) // Edit Anchor.
return true;
@@ -1149,8 +1149,8 @@
// Id. Apply only to the first link.
- if ( data.adv && data.adv.advId != '' )
+ if ( data.adv && data.adv.advId )
{
var links = this.getParentEditor().document.$.getElementsByTagName( 'a' );
- for ( var i = 0 ; i < links.length ; i++ )
+ for ( i = 0 ; i < links.length ; i++ )
{
if ( links[i].href == attributes.href )
@@ -1175,5 +1175,5 @@
this.restoreSelection();
- var selection = editor.getSelection();
+ selection = editor.getSelection();
element.moveChildren( newElement );
@@ -1203,14 +1203,14 @@
onLoad : function()
{
- if ( editor.config.linkUploadTab == false )
+ if ( !editor.config.linkUploadTab )
this.hidePage( 'upload' ); //Hide Upload tab.
- if ( editor.config.linkShowAdvancedTab == false )
+ if ( !editor.config.linkShowAdvancedTab )
this.hidePage( 'advanced' ); //Hide Advanded tab.
- if ( editor.config.linkBrowseServer == false )
+ if ( !editor.config.linkBrowseServer )
this.getContentElement( 'info', 'browse' ).getElement().hide();
- if ( editor.config.linkShowTargetTab == false )
+ if ( !editor.config.linkShowTargetTab )
this.hidePage( 'target' ); //Hide Target tab.
Index: /CKEditor/trunk/_source/plugins/link/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/link/plugin.js (revision 3308)
@@ -102,5 +102,5 @@
{
if ( !element )
- return;
+ return null;
var isAnchor = ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' );
@@ -109,5 +109,5 @@
{
if ( !( element = element.getAscendant( 'a', true ) ) )
- return;
+ return null;
isAnchor = ( element.getAttribute( 'name' ) && !element.getAttribute( 'href' ) );
Index: /CKEditor/trunk/_source/plugins/list/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3308)
@@ -101,7 +101,7 @@
currentIndex = listData.nextIndex;
}
- else if ( item.indent == -1 && baseIndex == 0 && item.grandparent )
- {
- var currentListItem;
+ else if ( item.indent == -1 && !baseIndex && item.grandparent )
+ {
+ currentListItem;
if ( listNodeNames[ item.grandparent.getName() ] )
currentListItem = doc.createElement( 'li' );
@@ -114,5 +114,5 @@
}
- for ( var i = 0 ; i < item.contents.length ; i++ )
+ for ( i = 0 ; i < item.contents.length ; i++ )
currentListItem.append( item.contents[i].clone( true, true ) );
@@ -180,9 +180,11 @@
{
if ( listNodeNames[ elements[i].getName() ] )
+ {
return setState.call( this, evt.editor,
this.type == elements[i].getName() ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
- }
-
- setState.call( this, evt.editor, CKEDITOR.TRISTATE_OFF );
+ }
+ }
+
+ return setState.call( this, evt.editor, CKEDITOR.TRISTATE_OFF );
}
@@ -208,5 +210,5 @@
var fakeParent = groupObj.root.getDocument().createElement( this.type );
- for ( var i = 0 ; i < selectedListItems.length ; i++ )
+ for ( i = 0 ; i < selectedListItems.length ; i++ )
{
var listIndex = selectedListItems[i].getCustomData( 'listarray_index' );
@@ -214,5 +216,6 @@
}
var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
- for ( var i = 0, length = newList.listNode.getChildCount(), child ;
+ var child;
+ for ( i = 0, length = newList.listNode.getChildCount() ;
i < length && ( child = newList.listNode.getChild( i ) ) ; i++ )
{
@@ -247,5 +250,5 @@
// We want to insert things that are in the same tree level only, so calculate the contents again
// by expanding the selected blocks to the same tree level.
- for ( var i = 0 ; i < contents.length ; i++ )
+ for ( i = 0 ; i < contents.length ; i++ )
{
var contentNode = contents[i],
@@ -302,5 +305,5 @@
var lastListIndex = null;
- for ( var i = 0 ; i < selectedListItems.length ; i++ )
+ for ( i = 0 ; i < selectedListItems.length ; i++ )
{
var listIndex = selectedListItems[i].getCustomData( 'listarray_index' );
@@ -312,5 +315,5 @@
// model's nextItem.indent <= currentItem.indent + 1 invariant. Otherwise the array model of the
// list cannot be converted back to a real DOM list.
- for ( var i = lastListIndex + 1 ; i < listArray.length ; i++ )
+ for ( i = lastListIndex + 1 ; i < listArray.length ; i++ )
{
if ( listArray[i].indent > listArray[i-1].indent + 1 )
@@ -330,5 +333,5 @@
// If groupObj.root is the last element in its parent, or its nextSibling is a
, then we should
// not add a
after the final item. So, check for the cases and trim the
.
- if ( groupObj.root.getNext() == null || groupObj.root.getNext().$.nodeName.toLowerCase() == 'br' )
+ if ( !groupObj.root.getNext() || groupObj.root.getNext().$.nodeName.toLowerCase() == 'br' )
{
if ( newList.listNode.getLast().$.nodeName.toLowerCase() == 'br' )
@@ -440,5 +443,5 @@
else
{
- var groupObj = { root : root, contents : [ block ] };
+ groupObj = { root : root, contents : [ block ] };
CKEDITOR.dom.element.setMarker( database, root, 'list_group_object', groupObj );
listGroups.push( groupObj );
@@ -453,5 +456,5 @@
while ( listGroups.length > 0 )
{
- var groupObj = listGroups.shift();
+ groupObj = listGroups.shift();
if ( this.state == CKEDITOR.TRISTATE_OFF )
{
@@ -466,8 +469,8 @@
// For all new lists created, merge adjacent, same type lists.
- for ( var i = 0 ; i < listsCreated.length ; i++ )
- {
- var listNode = listsCreated[i],
- stopFlag = false,
+ for ( i = 0 ; i < listsCreated.length ; i++ )
+ {
+ listNode = listsCreated[i];
+ var stopFlag = false,
currentNode = listNode;
Index: /CKEditor/trunk/_source/plugins/listblock/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/listblock/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/listblock/plugin.js (revision 3308)
@@ -156,5 +156,5 @@
}
- for ( title in groups )
+ for ( var title in groups )
{
var group = doc.getById( groups[ title ] ),
Index: /CKEditor/trunk/_source/plugins/pagebreak/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/pagebreak/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/pagebreak/plugin.js (revision 3308)
@@ -60,5 +60,5 @@
childStyle = child && ( child.name == 'span' ) && child.attributes.style;
- if ( childStyle && /page-break-after\s*:\s*always/i.test( style ) && /display\s*:\s*none/i.test( childStyle ) )
+ if ( childStyle && ( /page-break-after\s*:\s*always/i ).test( style ) && ( /display\s*:\s*none/i ).test( childStyle ) )
return editor.createFakeParserElement( element, 'cke_pagebreak', 'div' );
}
Index: /CKEditor/trunk/_source/plugins/panel/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/panel/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/panel/plugin.js (revision 3308)
@@ -127,6 +127,6 @@
{
var iframe = this.document.getById( 'cke_' + this.id + '_frame' ),
- parentDiv = iframe.getParent();
- dir = parentDiv.getAttribute( 'dir' );
+ parentDiv = iframe.getParent(),
+ dir = parentDiv.getAttribute( 'dir' ),
className = parentDiv.getParent().getAttribute( 'class' ),
doc = iframe.getFrameDocument();
@@ -291,7 +291,6 @@
// Move backward.
case 'prev' :
- var index = this._.focusIndex,
- links = this.element.getElementsByTag( 'a' ),
- link;
+ index = this._.focusIndex;
+ links = this.element.getElementsByTag( 'a' );
while ( index > 0 && ( link = links.getItem( --index ) ) )
@@ -310,6 +309,6 @@
case 'click' :
- var index = this._.focusIndex,
- link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
+ index = this._.focusIndex;
+ link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
if ( link )
@@ -318,4 +317,6 @@
return false;
}
+
+ return true;
}
}
Index: /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js
===================================================================
--- /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js (revision 3308)
@@ -61,5 +61,5 @@
}
]
- }
+ };
});
})();
Index: /CKEditor/trunk/_source/plugins/pastetext/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/pastetext/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/pastetext/plugin.js (revision 3308)
@@ -26,6 +26,6 @@
if ( !editor.getSelection() )
editor.focus();
- text = clipboardData.getData( 'Text' );
- editor.insertText( text );
+
+ editor.insertText( window.clipboardData.getData( 'Text' ) );
}
};
@@ -51,5 +51,5 @@
editor.on( 'beforePaste', function( event )
{
- setTimeout( function() { command.exec() }, 0 );
+ setTimeout( function() { command.exec(); }, 0 );
event.cancel();
},
Index: /CKEditor/trunk/_source/plugins/preview/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 3308)
@@ -49,4 +49,5 @@
try
{
+ var screen = window.screen;
iWidth = Math.Round( screen.width * 0.8 );
iHeight = Math.Round( screen.height * 0.7 );
Index: /CKEditor/trunk/_source/plugins/save/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/save/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/save/plugin.js (revision 3308)
@@ -30,5 +30,5 @@
// call the click() method of that button.
if ( $form.submit.click )
- $form.submit.click()
+ $form.submit.click();
}
}
Index: /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js
===================================================================
--- /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js (revision 3308)
@@ -84,5 +84,5 @@
title : editor.lang.common.generalTab,
padding : 0,
- align : top,
+ align : 'top',
elements : [
{
@@ -123,5 +123,6 @@
onClick : function( evt )
{
- var target = evt.data.getTarget();
+ var target = evt.data.getTarget(),
+ value;
if ( target.getName() == 'td' && ( value = target.$.getAttribute( 'value' )) )
{
Index: /CKEditor/trunk/_source/plugins/styles/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 3308)
@@ -531,7 +531,7 @@
breakStart = element;
}
- for ( var i = 0 ; i < endPath.elements.length ; i++ )
- {
- var element = endPath.elements[ i ];
+ for ( i = 0 ; i < endPath.elements.length ; i++ )
+ {
+ element = endPath.elements[ i ];
if ( element == endPath.block || element == endPath.blockLimit )
Index: /CKEditor/trunk/_source/plugins/stylescombo/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 3308)
@@ -66,5 +66,5 @@
// combo.
var lastType;
- for ( var i = 0 ; i < stylesList.length ; i++ )
+ for ( i = 0 ; i < stylesList.length ; i++ )
{
style = stylesList[ i ];
@@ -127,5 +127,5 @@
var currentValue = this.getValue();
- var elementPath = ev.data.path;
+ var elementPath = ev.data.path,
elements = elementPath.elements;
@@ -181,5 +181,5 @@
for ( var name in styles )
{
- var style = styles[ name ]
+ var style = styles[ name ],
type = style.type;
@@ -241,5 +241,8 @@
if ( stylesSet )
- return callback( stylesSets );
+ {
+ callback( stylesSets );
+ return ;
+ }
CKEDITOR.scriptLoader.load( url, function()
Index: /CKEditor/trunk/_source/plugins/tab/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/tab/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/tab/plugin.js (revision 3308)
@@ -103,5 +103,5 @@
// element following it containing tabindex=0.
- var element = this.getNextSourceNode( ignoreChildren, CKEDITOR.NODE_ELEMENT );
+ element = this.getNextSourceNode( ignoreChildren, CKEDITOR.NODE_ELEMENT );
while( element )
@@ -124,5 +124,5 @@
// 3. The first element with tabindex=0.
- var element = this.getDocument().getBody().getFirst();
+ element = this.getDocument().getBody().getFirst();
while( ( element = element.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT ) ) )
Index: /CKEditor/trunk/_source/plugins/table/dialogs/table.js
===================================================================
--- /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 3308)
@@ -35,5 +35,5 @@
var attrValue = source.getAttribute( attrName );
- if ( attrValue == null )
+ if ( attrValue === null )
attrValue = attribute.nodeValue;
@@ -146,5 +146,5 @@
{
var tbody = table.append( makeElement( 'tbody' ) ),
- rows = parseInt( info.txtRows, 10 ) || 0;
+ rows = parseInt( info.txtRows, 10 ) || 0,
cols = parseInt( info.txtCols, 10 ) || 0;
@@ -166,15 +166,15 @@
// Should we make a ?
var headers = info.selHeaders;
- if ( table.$.tHead == null && ( headers == 'row' || headers == 'both' ) )
- {
- var thead = new CKEDITOR.dom.element( table.$.createTHead() ),
- tbody = table.getElementsByTag( 'tbody' ).getItem( 0 ),
- theRow = tbody.getElementsByTag( 'tr' ).getItem( 0 );
+ if ( !table.$.tHead && ( headers == 'row' || headers == 'both' ) )
+ {
+ var thead = new CKEDITOR.dom.element( table.$.createTHead() );
+ tbody = table.getElementsByTag( 'tbody' ).getItem( 0 );
+ var theRow = tbody.getElementsByTag( 'tr' ).getItem( 0 );
// Change TD to TH:
- for ( var i = 0 ; i < theRow.getChildCount() ; i++ )
+ for ( i = 0 ; i < theRow.getChildCount() ; i++ )
{
var th = renameNode( theRow.getChild( i ), 'th' );
- if ( th != null )
+ if ( th )
th.setAttribute( 'scope', 'col' );
}
@@ -185,15 +185,15 @@
{
// Move the row out of the THead and put it in the TBody:
- var thead = new CKEDITOR.dom.element( table.$.tHead ),
- tbody = table.getElementsByTag( 'tbody' ).getItem( 0 );
+ thead = new CKEDITOR.dom.element( table.$.tHead );
+ tbody = table.getElementsByTag( 'tbody' ).getItem( 0 );
var previousFirstRow = tbody.getFirst();
while ( thead.getChildCount() > 0 )
{
- var theRow = thead.getFirst();
- for ( var i = 0; i < theRow.getChildCount() ; i++ )
+ theRow = thead.getFirst();
+ for ( i = 0; i < theRow.getChildCount() ; i++ )
{
var newCell = renameNode( theRow.getChild( i ), 'td' );
- if ( newCell != null )
+ if ( newCell )
newCell.removeAttribute( 'scope' );
}
@@ -206,8 +206,8 @@
if ( !this.hasColumnHeaders && ( headers == 'col' || headers == 'both' ) )
{
- for( var row = 0 ; row < table.$.rows.length ; row++ )
- {
- var newCell = renameNode( new CKEDITOR.dom.element( table.$.rows[row].cells[0] ), 'th' );
- if ( newCell != null )
+ for( row = 0 ; row < table.$.rows.length ; row++ )
+ {
+ newCell = renameNode( new CKEDITOR.dom.element( table.$.rows[row].cells[0] ), 'th' );
+ if ( newCell )
newCell.setAttribute( 'scope', 'col' );
}
@@ -217,11 +217,11 @@
if ( ( this.hasColumnHeaders ) && !( headers == 'col' || headers == 'both' ) )
{
- for( var i = 0 ; i < table.$.rows.length ; i++ )
- {
- var row = new CKEDITOR.dom.element( table.$.rows[i] );
+ for( i = 0 ; i < table.$.rows.length ; i++ )
+ {
+ row = new CKEDITOR.dom.element( table.$.rows[i] );
if ( row.getParent().getName() == 'tbody' )
{
- var newCell = renameNode( new CKEDITOR.dom.element( row.$.cells[0] ), 'td' );
- if ( newCell != null )
+ newCell = renameNode( new CKEDITOR.dom.element( row.$.cells[0] ), 'td' );
+ if ( newCell )
newCell.removeAttribute( 'scope' );
}
@@ -239,5 +239,5 @@
}
styles = styles.join( ';' );
- if ( styles != '' )
+ if ( styles )
table.$.style.cssText = styles;
else
@@ -518,5 +518,5 @@
selectedTable.setAttribute( 'cellSpacing', this.getValue() );
else
- setAttribute.removeAttribute( 'cellSpacing' );
+ selectedTable.removeAttribute( 'cellSpacing' );
}
},
@@ -579,5 +579,5 @@
var caption = this.getValue(),
captionElement = table.getElementsByTag( 'caption' );
- if ( caption != '' )
+ if ( caption )
{
if ( captionElement.count() > 0 )
Index: /CKEditor/trunk/_source/plugins/table/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/table/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/table/plugin.js (revision 3308)
@@ -159,5 +159,5 @@
{
if ( !element )
- return;
+ return null;
var isTable = element.is( 'table' ) ;
Index: /CKEditor/trunk/_source/plugins/wsc/dialogs/ciframe.html
===================================================================
--- /CKEditor/trunk/_source/plugins/wsc/dialogs/ciframe.html (revision 3307)
+++ /CKEditor/trunk/_source/plugins/wsc/dialogs/ciframe.html (revision 3308)
@@ -17,13 +17,15 @@
var results = regex.exec( window.location.href ) ;
- if( results == null )
+ if( results )
+ return results[ 1 ] ;
+ else
return '' ;
- else
- return results[ 1 ] ;
}
+
+var interval;
function sendData2Master()
{
- var destination = parent.parent ;
+ var destination = window.parent.parent ;
try
{
Index: /CKEditor/trunk/_source/plugins/wsc/dialogs/tmpFrameset.html
===================================================================
--- /CKEditor/trunk/_source/plugins/wsc/dialogs/tmpFrameset.html (revision 3307)
+++ /CKEditor/trunk/_source/plugins/wsc/dialogs/tmpFrameset.html (revision 3308)
@@ -25,12 +25,12 @@
function tryLoad ()
{
- if ( typeof( opener ) == 'undefined' || !opener )
- opener = parent ;
+ if ( !window.opener )
+ window.opener = window.parent ;
// get access to global parameters
- oParams = opener.oldFramesetPageParams ;
+ var oParams = window.opener.oldFramesetPageParams ;
// make frameset rows string prepare
- sFramesetRows = ( parseInt( oParams.firstframeh, 10 ) || '30') + ",*," + ( parseInt( oParams.thirdframeh, 10 ) || '150' ) + ',0' ;
+ var sFramesetRows = ( parseInt( oParams.firstframeh, 10 ) || '30') + ",*," + ( parseInt( oParams.thirdframeh, 10 ) || '150' ) + ',0' ;
document.getElementById( 'itFrameset' ).rows = sFramesetRows ;
Index: /CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js (revision 3308)
@@ -47,14 +47,14 @@
return function ()
{
- if ( typeof( doSpell ) == 'function' )
+ if ( typeof( window.doSpell ) == 'function' )
initAndSpell( dialog );
else if ( i++ == 180 ) // Timeout: 180 * 250ms = 45s.
_cancelOnError( errorMsg );
- }
- };
+ };
+ }
function _cancelOnError( m )
{
- if ( typeof( WSC_Error ) == 'undefined' )
+ if ( typeof( window.WSC_Error ) == 'undefined' )
{
CKEDITOR.document.getById( iframeId ).setStyle( 'display', 'none' );
@@ -69,12 +69,9 @@
//Call from window.setInteval expected at once.
if ( typeof( interval ) == 'undefined' )
- return null;
+ return;
window.clearInterval( interval );
- // Global var is used in FCK specific core.
- gFCKPluginName = 'wsc';
-
var sData = editor.getData(), // Get the data to be checked.
- LangComparer = new _SP_FCK_LangCompare(), // Language abbr standarts comparer.
+ LangComparer = new window._SP_FCK_LangCompare(), // Language abbr standarts comparer.
pluginPath = CKEDITOR.getUrl( editor.plugins.wsc.path + 'dialogs/' ), // Service paths corecting/preparing.
framesetPath = pluginPath + 'tmpFrameset.html';
@@ -89,5 +86,5 @@
CKEDITOR.document.getById( iframeId ).setStyle( 'display', 'block' );
- doSpell({
+ window.doSpell({
ctrl : textareaId,
lang : LangComparer.getSPLangCode( editor.langCode ),
@@ -115,5 +112,5 @@
schemaURI : pluginPath + 'wsc.css'
});
- };
+ }
return {
@@ -124,8 +121,8 @@
onShow : function()
{
- contentArea = this.getContentElement( 'general', 'content' ).getElement();
+ var contentArea = this.getContentElement( 'general', 'content' ).getElement();
contentArea.setHtml( pasteArea );
- if ( typeof( doSpell ) != 'function' )
+ if ( typeof( window.doSpell ) != 'function' )
{
// Load script.
Index: /CKEditor/trunk/_source/plugins/wsc/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wsc/plugin.js (revision 3307)
+++ /CKEditor/trunk/_source/plugins/wsc/plugin.js (revision 3308)
@@ -18,5 +18,5 @@
// SpellChecker doesn't work in Opera.
- command.modes = { wysiwyg : !( CKEDITOR.env.opera ) }
+ command.modes = { wysiwyg : !( CKEDITOR.env.opera ) };
editor.ui.addButton( 'SpellChecker',
Index: /CKEditor/trunk/_source/skins/office2003/skin.js
===================================================================
--- /CKEditor/trunk/_source/skins/office2003/skin.js (revision 3307)
+++ /CKEditor/trunk/_source/skins/office2003/skin.js (revision 3308)
@@ -54,5 +54,5 @@
// tc
- el = innerDialog.getChild( 2 );
+ var el = innerDialog.getChild( 2 );
el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
Index: /CKEditor/trunk/_source/skins/v2/skin.js
===================================================================
--- /CKEditor/trunk/_source/skins/v2/skin.js (revision 3307)
+++ /CKEditor/trunk/_source/skins/v2/skin.js (revision 3308)
@@ -54,5 +54,5 @@
// tc
- el = innerDialog.getChild( 2 );
+ var el = innerDialog.getChild( 2 );
el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
|