Skip to content

Commit

Permalink
Run fixlineends for the RC release.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.ckeditor.com/CKEditor/trunk@3712 da63caf2-3823-0410-a1e8-d69ccee00dfb
  • Loading branch information
fredck committed Jun 19, 2009
1 parent 7fc172c commit f1bedde
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 46 deletions.
4 changes: 2 additions & 2 deletions _samples/ui_color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[
[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
[ 'UIColor' ]
]
]
});

//]]>
Expand All @@ -47,7 +47,7 @@
[
[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
[ 'UIColor' ]
]
]
} );

//]]>
Expand Down
2 changes: 1 addition & 1 deletion _source/core/htmlparser/fragment.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ CKEDITOR.htmlParser.fragment = function() {
if ( fixForBody && !currentNode.type )
this.onTagOpen( fixForBody, {} );

// Shrinking consequential spaces into one single for all elements
// Shrinking consequential spaces into one single for all elements
// text contents.
if ( !inPre )
text = text.replace( /[\t\r\n ]{2,}|[\t\r\n]/g, ' ' );
Expand Down
2 changes: 1 addition & 1 deletion _source/lang/_translationstatus.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ tr.js Found: 332 Missing: 102
uk.js Found: 327 Missing: 107
vi.js Found: 326 Missing: 108
zh-cn.js Found: 332 Missing: 102
zh.js Found: 327 Missing: 107
zh.js Found: 327 Missing: 107
2 changes: 1 addition & 1 deletion _source/plugins/floatpanel/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ CKEDITOR.plugins.add( 'floatpanel', {

target.setStyle( 'height', height + 'px' );

// Fix IE < 8 visibility.
// Fix IE < 8 visibility.
panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' );
}

Expand Down
4 changes: 2 additions & 2 deletions _source/plugins/scayt/dialogs/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor ) {
var dic_buttons = [
// [0] contains buttons for creating
"dic_create,dic_restore",
// [1] contains buton for manipulation
// [1] contains buton for manipulation
"dic_rename,dic_delete"
];

Expand Down Expand Up @@ -220,7 +220,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor ) {
}
}

// * user dictionary
// * user dictionary
scayt.getNameUserDictionary( function( o ) {
var dic_name = o.dname;
if ( dic_name ) {
Expand Down
4 changes: 2 additions & 2 deletions _source/plugins/scayt/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
elements: {
span: function( element ) {
if ( element.attributes.scayt_word && element.attributes.scaytid ) {
delete element.name; // Write children, but don't write this node.
delete element.name; // Write children, but don't write this node.
return element;
}
}
Expand Down Expand Up @@ -376,7 +376,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// ** ahow ads entry point
// ** hide ads listener register
// try{
//scayt_control.showBanner( editor )
//scayt_control.showBanner( editor )
// }catch(err){}

return mainSuggestions;
Expand Down
2 changes: 1 addition & 1 deletion _source/plugins/sourcearea/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CKEDITOR.plugins.add( 'sourcearea', {
if ( CKEDITOR.env.ie ) {
if ( !CKEDITOR.env.ie8Compat ) {
onResize = function() {
// Holder rectange size is stretched by textarea,
// Holder rectange size is stretched by textarea,
// so hide it just for a moment.
textarea.hide();
textarea.setStyle( 'height', holderElement.$.clientHeight + 'px' );
Expand Down
2 changes: 1 addition & 1 deletion _source/skins/kama/dialog.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ body .cke_dialog
padding: 4px 8px;
display: inline-block;
cursor: pointer;

}

/* Gecko 1.8 layout workaround. */
Expand Down
2 changes: 1 addition & 1 deletion _source/skins/kama/skin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ CKEDITOR.skins.add( 'kama', ( function() {
// var last = toolbar.getLast();
// if ( !last || !last.getPrevious().hasClass( 'cke_rcombo' ) )
// continue;
//
//
// last.addClass( 'cke_toolbar_end_last' );
// }
// });
Expand Down
10 changes: 5 additions & 5 deletions _source/skins/kama/toolbar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
padding: 5px 6px 5px 3px;
}

.cke_skin_kama a.cke_toolbox_collapser,
.cke_skin_kama a.cke_toolbox_collapser,
.cke_skin_kama a:hover.cke_toolbox_collapser
{
background-image: url(images/arrowtop.gif);
Expand All @@ -38,20 +38,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
cursor: pointer;
}

.cke_skin_kama .cke_rtl a.cke_toolbox_collapser,
.cke_skin_kama .cke_rtl a.cke_toolbox_collapser,
.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser
{
float: left;
}

.cke_skin_kama a.cke_toolbox_collapser_min,
.cke_skin_kama a.cke_toolbox_collapser_min,
.cke_skin_kama a:hover.cke_toolbox_collapser_min
{
background-image: url(images/arrowleft.gif);
margin: 2px 4px;
}

.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min,
.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min,
.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min
{
background-image: url(images/arrowright.gif);
Expand Down Expand Up @@ -83,7 +83,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
display: none;
}

.cke_skin_kama .cke_toolgroup
.cke_skin_kama .cke_toolgroup
{
-moz-border-radius:5px;
-webkit-border-radius: 5px;
Expand Down
4 changes: 2 additions & 2 deletions _source/skins/office2003/toolbar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
float: right;
}

.cke_skin_office2003 .cke_toolgroup
.cke_skin_office2003 .cke_toolgroup
{
display: inline-block;
float: left;
height: 28px;
}

.cke_skin_office2003 .cke_rtl .cke_toolgroup
.cke_skin_office2003 .cke_rtl .cke_toolgroup
{
float: right;
}
Expand Down
1 change: 0 additions & 1 deletion _source/skins/v2/dialog.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,4 +648,3 @@ body .cke_dialog
{
border-color: #C7C78F;
}

2 changes: 1 addition & 1 deletion _source/skins/v2/toolbar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
float: left;
}

.cke_skin_v2 .cke_rtl .cke_toolgroup
.cke_skin_v2 .cke_rtl .cke_toolgroup
{
float: right;
}
Expand Down
8 changes: 4 additions & 4 deletions _source/tests/core/dom/documentfragment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
ct.append( frag );
assert.areSame( 'text\t\n', ct.getText() );
},

test_ltrim_ie : function()
{
if ( !CKEDITOR.env.ie )
Expand Down Expand Up @@ -153,7 +153,7 @@
frag.rtrim();
var ct = new CKEDITOR.dom.element( 'div' );
ct.append( frag );

assert.areSame( '\t\ntext', ct.getText() );
},

Expand Down Expand Up @@ -286,8 +286,8 @@
<div id="fragmentContainer1"></div>
<div id="fragmentContainer2"><div id="fragmentSibling1"></div></div>
<div id="fragmentContainer3"></div>
<div id="trimTarget">
text
<div id="trimTarget">
text
</div>
<iframe id="innerFrame" name="innerFrame" src="about:blank"></iframe>
</body>
Expand Down
34 changes: 17 additions & 17 deletions _source/tests/core/dom/range.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1951,7 +1951,7 @@

assert.isFalse( range.checkEndOfBlock() );
},

test_checkStartOfBlock1 : function()
{
var p = doc.getById( 'playground' );
Expand All @@ -1962,7 +1962,7 @@

range.setStartAt( p, CKEDITOR.POSITION_AFTER_START );
range.collapse( true );

assert.isTrue( range.checkStartOfBlock() );
},

Expand All @@ -1976,7 +1976,7 @@

range.setStartAt( p, CKEDITOR.POSITION_BEFORE_END );
range.collapse( true );

assert.isFalse( range.checkStartOfBlock() );
},

Expand All @@ -1990,7 +1990,7 @@

range.setStartAt( p.getFirst(), CKEDITOR.POSITION_AFTER_START );
range.collapse( true );

assert.isTrue( range.checkStartOfBlock() );
},

Expand All @@ -2004,7 +2004,7 @@

range.setStartAt( p.getFirst(), CKEDITOR.POSITION_BEFORE_END );
range.collapse( true );

assert.isFalse( range.checkStartOfBlock() );
},

Expand All @@ -2020,7 +2020,7 @@
// So, let's just check it and make it pass.
range.setStart( el, ( el.substring( 0, 1 ) == 'T' ) ? 0 : 1 );
range.collapse( true );

assert.isTrue( range.checkStartOfBlock() );
},

Expand All @@ -2034,7 +2034,7 @@

range.setStart( p.getFirst(), 5 );
range.collapse( true );

assert.isFalse( range.checkStartOfBlock() );
},

Expand All @@ -2046,7 +2046,7 @@

var range = new CKEDITOR.dom.range( doc );
range.selectNodeContents( el );

assert.isTrue( range.checkStartOfBlock() );
},

Expand All @@ -2058,7 +2058,7 @@

var range = new CKEDITOR.dom.range( doc );
range.selectNodeContents( el );

assert.isFalse( range.checkStartOfBlock() );
},

Expand All @@ -2072,7 +2072,7 @@

range.setStartAt( p, CKEDITOR.POSITION_AFTER_START );
range.collapse( true );

assert.isFalse( range.checkEndOfBlock() );
},

Expand All @@ -2086,7 +2086,7 @@

range.setStartAt( p, CKEDITOR.POSITION_BEFORE_END );
range.collapse( true );

assert.isTrue( range.checkEndOfBlock() );
},

Expand All @@ -2100,7 +2100,7 @@

range.setStartAt( p.getFirst(), CKEDITOR.POSITION_AFTER_START );
range.collapse( true );

assert.isFalse( range.checkEndOfBlock() );
},

Expand All @@ -2114,7 +2114,7 @@

range.setStartAt( p.getFirst(), CKEDITOR.POSITION_BEFORE_END );
range.collapse( true );

assert.isTrue( range.checkEndOfBlock() );
},

Expand All @@ -2128,7 +2128,7 @@

range.setStart( p.getFirst(), 1 );
range.collapse( true );

assert.isFalse( range.checkEndOfBlock() );
},

Expand All @@ -2142,7 +2142,7 @@

range.setStart( p.getFirst(), 5 );
range.collapse( true );

assert.isTrue( range.checkEndOfBlock() );
},

Expand All @@ -2154,7 +2154,7 @@

var range = new CKEDITOR.dom.range( doc );
range.selectNodeContents( el );

assert.isTrue( range.checkEndOfBlock() );
},

Expand All @@ -2166,7 +2166,7 @@

var range = new CKEDITOR.dom.range( doc );
range.selectNodeContents( el );

assert.isFalse( range.checkEndOfBlock() );
},

Expand Down
6 changes: 3 additions & 3 deletions _source/tests/core/htmlparser/htmlparser.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<script type="text/javascript" src="../../test.js"></script>
<script type="text/javascript">
//<![CDATA[

CKEDITOR.plugins.load( 'htmlwriter' );
var tc;
CKEDITOR.test.addTestCase( tc = ( function()
Expand Down Expand Up @@ -68,7 +68,7 @@
</script>
</head>
<body>

<textarea id="htmlOriginal1"><pre>
text<b>
inside<br /> <br /></b>
Expand All @@ -78,7 +78,7 @@
<textarea id="htmlResult1"><pre>
text<b>
inside

</b>

pre
Expand Down
2 changes: 1 addition & 1 deletion contents.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ img:-moz-broken
img, input, textarea
{
cursor: default;
}
}

0 comments on commit f1bedde

Please sign in to comment.