X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-ui-debug.js;h=9e05db1d42c50223fac990fb95e0f6e9656a314b;hb=d59b277dae414c8ed4dbc3522847f5f1b495081a;hp=65ba19364e72f16ac3f252a1647f9ed8a694dae2;hpb=783472a06071390bb4cb2e2862d8cb0aa48fab3b;p=roojs1
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 65ba19364e..9e05db1d42 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -567,6 +567,7 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, {
remove : function(record){
var index = this.data.indexOf(record);
this.data.removeAt(index);
+
if(this.pruneModifiedRecords){
this.modified.remove(record);
}
@@ -754,6 +755,17 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, {
this.totalLength = Math.max(t, this.data.length+r.length);
this.add(r);
}
+
+ if(this.parent && !Roo.isIOS && !this.useNativeIOS && this.parent.emptyTitle.length) {
+
+ var e = new Roo.data.Record({});
+
+ e.set(this.parent.displayField, this.parent.emptyTitle);
+ e.set(this.parent.valueField, '');
+
+ this.insert(0, e);
+ }
+
this.fireEvent("load", this, r, options, o);
if(options.callback){
options.callback.call(options.scope || this, r, options, true);
@@ -11214,7 +11226,7 @@ Roo.QuickTips = function(){
if(ttp){
showProc = show.defer(tm.showDelay, tm, [{
el: t,
- text: ttp,
+ text: ttp.replace(/\\n/g,'
'),
width: et.getAttributeNS(ns, cfg.width),
autoHide: et.getAttributeNS(ns, cfg.hide) != "user",
title: et.getAttributeNS(ns, cfg.title),
@@ -16520,6 +16532,7 @@ side Add an error icon to the right of the field with a popup on hover
*/
reset : function(){
this.setValue(this.resetValue);
+ this.originalValue = this.getValue();
this.clearInvalid();
},
@@ -19216,6 +19229,7 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
reset : function(){
// overridden so that last data is reset..
this.setValue(this.resetValue);
+ this.originalValue = this.getValue();
this.clearInvalid();
this.lastData = false;
if (this.view) {
@@ -20475,7 +20489,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
black: false,
white: false,
-
+ bodyCls : '',
/**
* Protected method that will not generally be called directly. It
@@ -20503,19 +20517,26 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
'';
} else {
-
+ st = '';
}
st += '';
+ var cls = 'roo-htmleditor-body';
+
+ if(this.bodyCls.length){
+ cls += ' ' + this.bodyCls;
+ }
return '