Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.6.1
[ckeditor.git]
/
_source
/
plugins
/
templates
/
plugin.js
diff --git
a/_source/plugins/templates/plugin.js
b/_source/plugins/templates/plugin.js
index
64d70e0
..
db9ef74
100644
(file)
--- a/
_source/plugins/templates/plugin.js
+++ b/
_source/plugins/templates/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-42,7
+42,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
var toLoad = [];
\r
\r
// Look for pending template files to get loaded.
\r
var toLoad = [];
\r
\r
// Look for pending template files to get loaded.
\r
- for ( var i = 0 ; i < templateFiles.length ; i++ )
\r
+ for ( var i = 0, count = templateFiles.length ; i < count ; i++ )
\r
{
\r
if ( !loadedTemplatesFiles[ templateFiles[ i ] ] )
\r
{
\r
{
\r
if ( !loadedTemplatesFiles[ templateFiles[ i ] ] )
\r
{
\r
@@
-51,7
+51,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
}
\r
}
\r
\r
}
\r
}
\r
\r
- if ( toLoad.length > 0 )
\r
+ if ( toLoad.length )
\r
CKEDITOR.scriptLoader.load( toLoad, callback );
\r
else
\r
setTimeout( callback, 0 );
\r
CKEDITOR.scriptLoader.load( toLoad, callback );
\r
else
\r
setTimeout( callback, 0 );
\r
@@
-65,10
+65,10
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
* comma. It must match definitions loaded with the templates_files setting.
\r
* @type String
\r
* @default 'default'
\r
* comma. It must match definitions loaded with the templates_files setting.
\r
* @type String
\r
* @default 'default'
\r
+ * @name CKEDITOR.config.templates
\r
* @example
\r
* config.templates = 'my_templates';
\r
*/
\r
* @example
\r
* config.templates = 'my_templates';
\r
*/
\r
-CKEDITOR.config.templates = 'default';
\r
\r
/**
\r
* The list of templates definition files to load.
\r
\r
/**
\r
* The list of templates definition files to load.
\r