X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftemplates%2Fplugin.js;h=622615981c9baee8b6f7d5804683377cac42808d;hb=2f22c0c38f17e75be5541089076885442aaa2377;hp=dc8887050703261c45bcc374b85e2e707f287389;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git diff --git a/_source/plugins/templates/plugin.js b/_source/plugins/templates/plugin.js index dc88870..6226159 100644 --- a/_source/plugins/templates/plugin.js +++ b/_source/plugins/templates/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -42,7 +42,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var toLoad = []; // Look for pending template files to get loaded. - for ( var i = 0 ; i < templateFiles.length ; i++ ) + for ( var i = 0, count = templateFiles.length ; i < count ; i++ ) { if ( !loadedTemplatesFiles[ templateFiles[ i ] ] ) { @@ -51,7 +51,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } } - if ( toLoad.length > 0 ) + if ( toLoad.length ) CKEDITOR.scriptLoader.load( toLoad, callback ); else setTimeout( callback, 0 ); @@ -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. * @type String * @default 'default' + * @name CKEDITOR.config.templates * @example * config.templates = 'my_templates'; */ -CKEDITOR.config.templates = 'default'; /** * The list of templates definition files to load. @@ -85,6 +85,7 @@ CKEDITOR.config.templates = 'default'; CKEDITOR.config.templates_files = [ CKEDITOR.getUrl( + '_source/' + // @Packager.RemoveLine 'plugins/templates/templates/default.js' ) ];