projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roojs-ui.js
[roojs1]
/
roojs-ui-debug.js
diff --git
a/roojs-ui-debug.js
b/roojs-ui-debug.js
index
4256ded
..
ac8135f
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-19810,7
+19810,7
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
// give fake names to child combo;
this.combo.hiddenName = this.hiddenName ? (this.hiddenName+'-subcombo') : this.hiddenName;
// give fake names to child combo;
this.combo.hiddenName = this.hiddenName ? (this.hiddenName+'-subcombo') : this.hiddenName;
- this.combo.name = this.name? (this.name+'-subcombo') : this.name;
+ this.combo.name = this.name
? (this.name+'-subcombo') : this.name;
this.combo = Roo.factory(this.combo, Roo.form);
this.combo.onRender(ct, position);
this.combo = Roo.factory(this.combo, Roo.form);
this.combo.onRender(ct, position);
@@
-19931,6
+19931,7
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
{
var valueField = this.combo.valueField;
var displayField = this.combo.displayField;
{
var valueField = this.combo.valueField;
var displayField = this.combo.displayField;
+
if (this.items.indexOfKey(rec[valueField]) > -1) {
//console.log("GOT " + rec.data.id);
return;
if (this.items.indexOfKey(rec[valueField]) > -1) {
//console.log("GOT " + rec.data.id);
return;
@@
-19962,7
+19963,6
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
this.items.each(function(f) {
ar.push(f.data[idField]);
this.items.each(function(f) {
ar.push(f.data[idField]);
-
});
this.hiddenEl.dom.value = ar.join(',');
this.validate();
});
this.hiddenEl.dom.value = ar.join(',');
this.validate();
@@
-19988,11
+19988,9
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
},
setValue: function(v) // not a valid action - must use addItems..
{
},
setValue: function(v) // not a valid action - must use addItems..
{
-
- this.reset();
-
-
+ this.reset();
+
if (this.store.isLocal && (typeof(v) == 'string')) {
// then we can use the store to find the values..
// comma seperated at present.. this needs to allow JSON based encoding..
if (this.store.isLocal && (typeof(v) == 'string')) {
// then we can use the store to find the values..
// comma seperated at present.. this needs to allow JSON based encoding..
@@
-21504,6
+21502,11
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
var remove_keep_children= Roo.HtmlEditorCore.remove.indexOf(node.tagName.toLowerCase()) > -1;
var remove_keep_children= Roo.HtmlEditorCore.remove.indexOf(node.tagName.toLowerCase()) > -1;
+ // spans with no attributes - just remove them..
+ if ((!node.attributes || !node.attributes.length) && lcname == 'span') {
+ remove_keep_children = true;
+ }
+
// remove <a name=....> as rendering on yahoo mailer is borked with this.
// this will have to be flaged elsewhere - perhaps ablack=name... on the mailer..
// remove <a name=....> as rendering on yahoo mailer is borked with this.
// this will have to be flaged elsewhere - perhaps ablack=name... on the mailer..
@@
-21524,6
+21527,10
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
}
if (!node.attributes || !node.attributes.length) {
}
if (!node.attributes || !node.attributes.length) {
+
+
+
+
this.cleanUpChildren(node);
return;
}
this.cleanUpChildren(node);
return;
}
@@
-21620,11
+21627,11
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
if (a.name == 'class') {
if (a.value.match(/^Mso/)) {
if (a.name == 'class') {
if (a.value.match(/^Mso/)) {
- node.
className = ''
;
+ node.
removeAttribute('class')
;
}
if (a.value.match(/^body$/)) {
}
if (a.value.match(/^body$/)) {
- node.
className = ''
;
+ node.
removeAttribute('class')
;
}
continue;
}
}
continue;
}
@@
-21682,16
+21689,20
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
node.parentNode.removeChild(node);
return;
}
node.parentNode.removeChild(node);
return;
}
-
+ //Roo.log(node.tagName);
// remove - but keep children..
// remove - but keep children..
- if (node.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|font)/)) {
+ if (node.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|v:|font)/)) {
+ //Roo.log('-- removed');
while (node.childNodes.length) {
var cn = node.childNodes[0];
node.removeChild(cn);
node.parentNode.insertBefore(cn, node);
while (node.childNodes.length) {
var cn = node.childNodes[0];
node.removeChild(cn);
node.parentNode.insertBefore(cn, node);
+ // move node to parent - and clean it..
+ this.cleanWord(cn);
}
node.parentNode.removeChild(node);
}
node.parentNode.removeChild(node);
- this.iterateChildren(node, this.cleanWord);
+ /// no need to iterate chidlren = it's got none..
+ //this.iterateChildren(node, this.cleanWord);
return;
}
// clean styles
return;
}
// clean styles
@@
-23233,8
+23244,9
@@
Roo.apply(Roo.form.HtmlEditor.ToolbarStandard.prototype, {
var c = Roo.get(editorcore.doc.body);
c.select('[class]').each(function(s) {
var c = Roo.get(editorcore.doc.body);
c.select('[class]').each(function(s) {
- s.dom.
className = ''
;
+ s.dom.
removeAttribute('class')
;
});
});
+ editorcore.cleanWord();
editorcore.syncValue();
},
tabIndex:-1
editorcore.syncValue();
},
tabIndex:-1
@@
-24892,7
+24904,7
@@
clientValidation Boolean Applies to submit only. Pass true to call fo
return this;
},
return this;
},
-
+
/**
* Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name
* they are returned as an array.
/**
* Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name
* they are returned as an array.