Changeset 2090

Timestamp:

06/18/08 19:04:27 (5 years ago)

Author:

fredck

Message:

Added test for CKEDITOR including some core fixes that came from it.
Fixed the test page output.

Location:

CKEditor/branches/prototype/_source

Files:

• core/ckeditor.js (modified) (5 diffs)
• core/ckeditor_basic.js (modified) (5 diffs)
• tests/core/ckeditor.html (added)
• tests/test.js (modified) (2 diffs)
• tests/testall.html (modified) (1 diff)

CKEditor/branches/prototype/_source/core/ckeditor.js

@@ -37 +37 @@
 
                 var loadedConfig = loadConfigLoaded[ customConfig ] || ( loadConfigLoaded[ customConfig ] = { editors : [] } );
-                
+
                 // If the custom config has already been downloaded, reuse it.
                 if ( loadedConfig.fn )
@@ -53 +53 @@
                 {
                         // Add the editor to the list of editors waiting for this config.
-                        loadedConfig.editors.push( editor ); 
+                        loadedConfig.editors.push( editor );
 
                         // Load the custom configuration file.
@@ -73 +73 @@
                                                         loadConfig( editor );
                                                 });
-                                        
+
                                         delete loadedConfig.editors;
                                 } );
                 }
-                
+
                 return true;
         };
@@ -85 +85 @@
         {
                 var textarea = new CKEDITOR.dom.element( textarea );
-                textarea.hide();
 
                 // Create the editor instance.
                 var editor = new CKEDITOR.editor( textarea );
+
+                // Abort it there is already an instance with that name.
+                if ( CKEDITOR.instances[ editor.name ] )
+                        return;
+
+                textarea.hide();
+
                 CKEDITOR.instances[ editor.name ] = editor;
-                
+
                 // Setup the lister for the "configloaded" event.
                 editor.on( 'configloaded', function()
@@ -99 +105 @@
 
                                 // Fire the "instancecreated" event.
-                                CKEDITOR.fire( 'instancecreated', editor.name, editor );                                
+                                CKEDITOR.fire( 'instancecreated', editor.name, editor );
                         });
 

CKEditor/branches/prototype/_source/core/ckeditor_basic.js

@@ -22 +22 @@
 CKEDITOR.event.implementOn( CKEDITOR );
 
-/** 
+/**
  * The class name used to identify <textarea> elements to be replace
  * by CKEditor instances.
@@ -43 +43 @@
 CKEDITOR.replaceByClassEnabled = true;
 
-/** 
+/**
  * Replaces a specific <textarea> with a CKEditor instance.
  * @param {object|string} elementOrIdOrName The DOM element (textarea), its
@@ -81 +81 @@
                         if ( !textarea )
                         {
-                                alert( '[CKEDITOR.replace] The <textarea> with id or name "' + elementOrIdOrName + '" was not found' );
+                                throw '[CKEDITOR.replace] The <textarea> with id or name "' + elementOrIdOrName + '" was not found.';
                                 return;
                         }
                 }
-                
+
                 CKEDITOR.replace._replaceElement( textarea, config );
         }
 };
 
-// This function will be overwritten by the fill core code implementation.
+// This function will be overwritten by the full core code implementation.
 CKEDITOR.replace._replaceElement = function( textarea, config )
 {
@@ -132 +132 @@
                 var name = textarea.name;
 
-                // The "name" attribute must exist.
-                if ( !name || name.length == 0 )
+                // The "name" and/or "id" attribute must exist.
+                if ( !textarea.name && !textarea.id )
                         continue;
 
@@ -166 +166 @@
 {
 };
-        
+
 if ( CKEDITOR.status == 'unloaded' )
 {

CKEditor/branches/prototype/_source/tests/test.js

@@ -41 +41 @@
                 div.innerHTML = text;
         };
+        
+        var htmlEncode = function( data )
+        {
+                if ( typeof data != 'string' )
+                        return data;
+
+                return data.replace( 
+                        '&', '&' ).replace(
+                        '<', '&lt;' ).replace(
+                        '>', '&gt;' );
+        };
 
         window.onload = function()
@@ -52 +63 @@
                         {
                                 case runner.TEST_FAIL_EVENT:
-                                        outputResult( '<span class="testFail">FAIL</span> Test named "' + data.testName + '" failed with message: "' + data.error.message + '".<div>Expected:</div><pre>' + data.error.expected + '</pre><div>Actual:</div><pre>' + data.error.actual + '</pre>' );
+                                        outputResult( '<span class="testFail">FAIL</span> Test named "' + data.testName + '" failed with message: "' + htmlEncode( data.error.message ) + '".<div>Expected:</div><pre>' + htmlEncode( data.error.expected ) + '</pre><div>Actual:</div><pre>' + htmlEncode( data.error.actual ) + '</pre>' );
                                         break;
                                 case runner.TEST_PASS_EVENT:

CKEditor/branches/prototype/_source/tests/testall.html

@@ -10 +10 @@
 [
         'core/ajax',
+        'core/ckeditor',
         'core/dom/element',
         'core/env',