Changeset 2500

Timestamp:

09/29/08 07:07:07 (5 years ago)

Author:

martinkou

Message:

Added validation logic for dialog elements.
Removed debug message in radio button element.

Location:

CKEditor/branches/prototype/_source/plugins

Files:

• dialog/plugin.js (modified) (3 diffs)
• dialogui/plugin.js (modified) (4 diffs)

CKEditor/branches/prototype/_source/plugins/dialog/plugin.js

@@ -330 +330 @@
                         onClick : function( evt )
                         {
-                                var ret = evt.data.dialog.fire( 'ok', { hide : true } ).hide;
+                                var dialog = evt.data.dialog,
+                                        ret = dialog.fire( 'ok', { hide : true } ).hide;
+                                for ( var i in dialog._.contents )
+                                {
+                                        if ( dialog._.contents[i].validate && !dialog._.contents[i].validate( dialog ) )
+                                                ret = false;
+                                }
                                 if ( ret !== false )
-                                        evt.data.dialog.hide();
+                                        dialog.hide();
                         }
                 },
@@ -354 +360 @@
                                 }
                                 if ( ret !== false )
-                                        evt.data.dialog.hide();
+                                        dialog.hide();
                         }
                 },
@@ -430 +436 @@
                                                                                 title : 'Your love is like bad medicine!',
                                                                                 id : 'testText4',
-                                                                                'default' : 'hello world!'
+                                                                                'default' : 'hello world!',
+                                                                                validate : function( dialog )
+                                                                                {
+                                                                                        var valid = /^[A-Z a-z!]+$/.test( this.getValue() );
+                                                                                        if ( !valid )
+                                                                                        {
+                                                                                                alert( 'Test Text 4 must only contain alphanumeric characters, space, or ! and must not be empty.' );
+                                                                                                this.focus();
+                                                                                        }
+                                                                                        return valid;
+                                                                                }
                                                                         },
 

CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js

@@ -134 +134 @@
                                         attributes.style = styleStr.join( '; ' );
 
+                                // Set the validator, if any.
+                                if ( elementDefinition.validate )
+                                        this.validate = elementDefinition.validate;
+
                                 var innerHTML = function()
                                 {
@@ -152 +156 @@
                                 var _ = initPrivateObject.call( this, elementDefinition );
                                 this._['default'] = elementDefinition.checked || false;
+
+                                if ( elementDefinition.validate )
+                                        this.validate = elementDefinition.validate();
 
                                 var innerHTML = function()
@@ -181 +188 @@
                                 if ( !( 'default' in this._ ) )
                                         this._['default'] = elementDefinition.items[0][1] ;
+                                if ( elementDefinition.validate )
+                                        this.validate = elementDefinition.valdiate;
                                 var children = [];
 
@@ -336 +345 @@
                                 setValue : function( value )
                                 {
-                                        console.log( 'Radio button... children length=' + this._.children.length );
                                         var children = this._.children,
                                                 item;