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.5.1
[ckeditor.git]
/
_source
/
plugins
/
forms
/
plugin.js
diff --git
a/_source/plugins/forms/plugin.js
b/_source/plugins/forms/plugin.js
index
7d8ea45
..
3be5c3b
100644
(file)
--- a/
_source/plugins/forms/plugin.js
+++ b/
_source/plugins/forms/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, 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
@@
-149,25
+149,28
@@
CKEDITOR.plugins.add( 'forms',
\r
if ( name == 'input' )
\r
{
\r
\r
if ( name == 'input' )
\r
{
\r
- var type = element.getAttribute( 'type' );
\r
+ switch( element.getAttribute( 'type' ) )
\r
+ {
\r
+ case 'button' :
\r
+ case 'submit' :
\r
+ case 'reset' :
\r
+ return { button : CKEDITOR.TRISTATE_OFF };
\r
\r
\r
- if ( type == 'text' || type == 'password' )
\r
- return { textfield : CKEDITOR.TRISTATE_OFF };
\r
+ case 'checkbox' :
\r
+ return { checkbox : CKEDITOR.TRISTATE_OFF };
\r
\r
\r
- if ( type == 'button' || type == 'submit' || type == 'reset' )
\r
- return { button : CKEDITOR.TRISTATE_OFF };
\r
+ case 'radio' :
\r
+ return { radio : CKEDITOR.TRISTATE_OFF };
\r
\r
\r
- if ( type == 'checkbox' )
\r
- return { checkbox : CKEDITOR.TRISTATE_OFF };
\r
+ case 'image' :
\r
+ return { imagebutton : CKEDITOR.TRISTATE_OFF };
\r
\r
\r
- if ( type == 'radio' )
\r
- return { radio : CKEDITOR.TRISTATE_OFF };
\r
-
\r
- if ( type == 'image' )
\r
- return { imagebutton : CKEDITOR.TRISTATE_OFF };
\r
+ default :
\r
+ return { textfield : CKEDITOR.TRISTATE_OFF };
\r
+ }
\r
}
\r
\r
}
\r
\r
- if ( name == 'img' && element.getAttribute( '_cke_real_element_type' ) == 'hiddenfield' )
\r
+ if ( name == 'img' && element.data( 'cke-real-element-type' ) == 'hiddenfield' )
\r
return { hiddenfield : CKEDITOR.TRISTATE_OFF };
\r
}
\r
});
\r
return { hiddenfield : CKEDITOR.TRISTATE_OFF };
\r
}
\r
});
\r
@@
-183,18
+186,15
@@
CKEDITOR.plugins.add( 'forms',
evt.data.dialog = 'select';
\r
else if ( element.is( 'textarea' ) )
\r
evt.data.dialog = 'textarea';
\r
evt.data.dialog = 'select';
\r
else if ( element.is( 'textarea' ) )
\r
evt.data.dialog = 'textarea';
\r
- else if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'hiddenfield' )
\r
+ else if ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'hiddenfield' )
\r
evt.data.dialog = 'hiddenfield';
\r
else if ( element.is( 'input' ) )
\r
{
\r
evt.data.dialog = 'hiddenfield';
\r
else if ( element.is( 'input' ) )
\r
{
\r
- var type = element.getAttribute( 'type' );
\r
-
\r
- switch ( type )
\r
+ switch ( element.getAttribute( 'type' ) )
\r
{
\r
{
\r
- case 'text' : case 'password':
\r
- evt.data.dialog = 'textfield';
\r
- break;
\r
- case 'button' : case 'submit' : case 'reset' :
\r
+ case 'button' :
\r
+ case 'submit' :
\r
+ case 'reset' :
\r
evt.data.dialog = 'button';
\r
break;
\r
case 'checkbox' :
\r
evt.data.dialog = 'button';
\r
break;
\r
case 'checkbox' :
\r
@@
-206,6
+206,9
@@
CKEDITOR.plugins.add( 'forms',
case 'image' :
\r
evt.data.dialog = 'imagebutton';
\r
break;
\r
case 'image' :
\r
evt.data.dialog = 'imagebutton';
\r
break;
\r
+ default :
\r
+ evt.data.dialog = 'textfield';
\r
+ break;
\r
}
\r
}
\r
});
\r
}
\r
}
\r
});
\r
@@
-228,6
+231,9
@@
CKEDITOR.plugins.add( 'forms',
{
\r
var attrs = input.attributes,
\r
type = attrs.type;
\r
{
\r
var attrs = input.attributes,
\r
type = attrs.type;
\r
+ // Old IEs don't provide type for Text inputs #5522
\r
+ if ( !type )
\r
+ attrs.type = 'text';
\r
if ( type == 'checkbox' || type == 'radio' )
\r
attrs.value == 'on' && delete attrs.value;
\r
}
\r
if ( type == 'checkbox' || type == 'radio' )
\r
attrs.value == 'on' && delete attrs.value;
\r
}
\r
@@
-269,10
+275,7
@@
if ( CKEDITOR.env.ie )
return !!this.$.checked;
\r
case 'value' :
\r
var type = this.getAttribute( 'type' );
\r
return !!this.$.checked;
\r
case 'value' :
\r
var type = this.getAttribute( 'type' );
\r
- if ( type == 'checkbox' || type == 'radio' )
\r
- return this.$.value != 'on';
\r
- break;
\r
- default:
\r
+ return type == 'checkbox' || type == 'radio' ? this.$.value != 'on' : this.$.value;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r