projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into wip_leon_T7199_adding_images_to_bolierplates
[roojs1]
/
roojs-debug.js
diff --git
a/roojs-debug.js
b/roojs-debug.js
index
047cba8
..
99fbfb3
100644
(file)
--- a/
roojs-debug.js
+++ b/
roojs-debug.js
@@
-25886,14
+25886,16
@@
Roo.extend(Roo.data.DataProxy, Roo.util.Observable);
*/
/**
* @class Roo.data.MemoryProxy
*/
/**
* @class Roo.data.MemoryProxy
+ * @extends Roo.data.DataProxy
* An implementation of Roo.data.DataProxy that simply passes the data specified in its constructor
* to the Reader when its load method is called.
* @constructor
* An implementation of Roo.data.DataProxy that simply passes the data specified in its constructor
* to the Reader when its load method is called.
* @constructor
- * @param {Object}
data The data object which the Reader uses to construct a block of Roo.data.Records.
+ * @param {Object}
config A config object containing the objects needed for the Store to access data,
*/
*/
-Roo.data.MemoryProxy = function(data){
- if (data.data) {
- data = data.data;
+Roo.data.MemoryProxy = function(config){
+ var data = config;
+ if (typeof(config) != 'undefined' && typeof(config.data) != 'undefined') {
+ data = config.data;
}
Roo.data.MemoryProxy.superclass.constructor.call(this);
this.data = data;
}
Roo.data.MemoryProxy.superclass.constructor.call(this);
this.data = data;
@@
-25901,6
+25903,9
@@
Roo.data.MemoryProxy = function(data){
Roo.extend(Roo.data.MemoryProxy, Roo.data.DataProxy, {
Roo.extend(Roo.data.MemoryProxy, Roo.data.DataProxy, {
+ /**
+ * @cfg {Object} data The data object which the Reader uses to construct a block of Roo.data.Records.
+ */
/**
* Load data from the requested source (in this case an in-memory
* data object passed to the constructor), read the data object into
/**
* Load data from the requested source (in this case an in-memory
* data object passed to the constructor), read the data object into
@@
-46194,7
+46199,7
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
var kv = s.split(":");
// what ever is left... we allow.
var kv = s.split(":");
// what ever is left... we allow.
- ret[kv[0]] = kv[1];
+ ret[kv[0]
.trim()
] = kv[1];
});
return ret;
},
});
return ret;
},
@@
-46221,7
+46226,9
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
var ns = p,
parent = p.parentNode,
doc = parent.ownerDocument,
var ns = p,
parent = p.parentNode,
doc = parent.ownerDocument,
- items = [];
+ items = [];
+
+
while (ns) {
if (ns.nodeType != 1) {
ns = ns.nextSibling;
while (ns) {
if (ns.nodeType != 1) {
ns = ns.nextSibling;
@@
-46232,14
+46239,16
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
}
items.push(ns);
ns = ns.nextSibling;
}
items.push(ns);
ns = ns.nextSibling;
-
}
}
+
+
var ul = parent.ownerDocument.createElement('ul'); // what about number lists...
parent.insertBefore(ul, p);
var lvl = 0;
var stack = [ ul ];
var last_li = false;
var ul = parent.ownerDocument.createElement('ul'); // what about number lists...
parent.insertBefore(ul, p);
var lvl = 0;
var stack = [ ul ];
var last_li = false;
- items.forEach(function(n) {
+
+ items.forEach(function(n, ipos) {
//Roo.log("got innertHMLT=" + n.innerHTML);
var spans = n.getElementsByTagName('span');
//Roo.log("got innertHMLT=" + n.innerHTML);
var spans = n.getElementsByTagName('span');
@@
-46271,12
+46280,16
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
return;
}
return;
}
- var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1;
+ var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1 ;
+
+
+
if (nlvl > lvl) {
//new indent
var nul = doc.createElement('ul'); // what about number lists...
last_li.appendChild(nul);
stack[nlvl] = nul;
if (nlvl > lvl) {
//new indent
var nul = doc.createElement('ul'); // what about number lists...
last_li.appendChild(nul);
stack[nlvl] = nul;
+
}
lvl = nlvl;
}
lvl = nlvl;
@@
-53467,7
+53480,8
@@
Roo.apply(Roo.form.HtmlEditor.ToolbarContext.prototype, {
//_this.updateToolbar(null, null, pn);
_this.updateToolbar(null, null, null);
_this.updateFooter(false);
//_this.updateToolbar(null, null, pn);
_this.updateToolbar(null, null, null);
_this.updateFooter(false);
-
+
+ editorcore.syncValue();
}
}
}
}
@@
-55288,7
+55302,7
@@
Roo.extend(Roo.form.Layout, Roo.Component, {
* a function which returns such a specification.
*/
/**
* a function which returns such a specification.
*/
/**
- * @cfg {String} labelAlign
+ * @cfg {String} labelAlign
(left|top|right)
* Valid values are "left," "top" and "right" (defaults to "left")
*/
/**
* Valid values are "left," "top" and "right" (defaults to "left")
*/
/**
@@
-55408,6
+55422,7
@@
Roo.extend(Roo.form.Layout, Roo.Component, {
}
});
}
});
+
/**
* @class Roo.form.Column
* @extends Roo.form.Layout
/**
* @class Roo.form.Column
* @extends Roo.form.Layout
@@
-55442,7
+55457,6
@@
Roo.extend(Roo.form.Column, Roo.form.Layout, {
}
});
}
});
-
/**
* @class Roo.form.Row
* @extends Roo.form.Layout
/**
* @class Roo.form.Row
* @extends Roo.form.Layout