X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-ui-debug.js;h=8e00541f52456560bddaf12be677b6887718e1b5;hb=d797239a600c927a721556694e9ca3faf26a3337;hp=8b977c32d9a0a6cdaf99fac236decde07da1c6dc;hpb=0ddab346ff681443c6ed9cf659ccd2ffcec4fda8;p=roojs1 diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 8b977c32d9..8e00541f52 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); @@ -1387,7 +1399,7 @@ Roo.extend(Roo.data.MemoryProxy, Roo.data.DataProxy, { params = params || {}; var result; try { - result = reader.readRecords(this.data); + result = reader.readRecords(params.data ? params.data :this.data); }catch(e){ this.fireEvent("loadexception", this, arg, null, e); callback.call(scope, null, arg, false); @@ -2126,24 +2138,31 @@ var myReader = new Roo.data.ArrayReader({ *
[ [1, 'Bill', 'Gardener'], [2, 'Ben', 'Horticulturalist'] ]
- * @cfg {String} id (optional) The subscript within row Array that provides an ID for the Record
+
* @constructor
* Create a new JsonReader
* @param {Object} meta Metadata configuration options.
- * @param {Object} recordType Either an Array of field definition objects
+ * @param {Object|Array} recordType Either an Array of field definition objects
+ *
+ * @cfg {Array} fields Array of field definition objects
+ * @cfg {String} id Name of the property within a row object that contains a record identifier value.
* as specified to {@link Roo.data.Record#create},
* or an {@link Roo.data.Record} object
+ *
+ *
* created using {@link Roo.data.Record#create}.
*/
Roo.data.ArrayReader = function(meta, recordType){
- Roo.data.ArrayReader.superclass.constructor.call(this, meta, recordType);
+
+
+ Roo.data.ArrayReader.superclass.constructor.call(this, meta, recordType||meta.fields);
};
Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, {
/**
* Create a data block containing Roo.data.Records from an XML document.
* @param {Object} o An Array of row objects which represents the dataset.
- * @return {Object} data A data block which is used by an Roo.data.Store object as
+ * @return {Object} A data block which is used by an {@link Roo.data.Store} object as
* a cache of Roo.data.Records.
*/
readRecords : function(o){
@@ -2532,6 +2551,7 @@ Roo.extend(Roo.data.Node, Roo.util.Observable, {
}else if(arguments.length > 1){
multi = arguments;
}
+
// if passed an array or multiple args do them one by one
if(multi){
for(var i = 0, len = multi.length; i < len; i++) {
@@ -2550,6 +2570,7 @@ Roo.extend(Roo.data.Node, Roo.util.Observable, {
}
oldParent.removeChild(node);
}
+
index = this.childNodes.length;
if(index == 0){
this.setFirstChild(node);
@@ -2567,6 +2588,9 @@ Roo.extend(Roo.data.Node, Roo.util.Observable, {
this.setLastChild(node);
node.setOwnerTree(this.getOwnerTree());
this.fireEvent("append", this.ownerTree, this, node, index);
+ if(this.ownerTree) {
+ this.ownerTree.fireEvent("appendnode", this, node, index);
+ }
if(oldParent){
node.fireEvent("move", this.ownerTree, node, oldParent, this, index);
}
@@ -11214,7 +11238,7 @@ Roo.QuickTips = function(){
if(ttp){
showProc = show.defer(tm.showDelay, tm, [{
el: t,
- text: ttp,
+ text: ttp.replace(/\\n/g,'