projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #6640 - Inspection Schedule
[roojs1]
/
roojs-debug.js
diff --git
a/roojs-debug.js
b/roojs-debug.js
index
6abd31e
..
257bcc4
100644
(file)
--- a/
roojs-debug.js
+++ b/
roojs-debug.js
@@
-4693,11
+4693,18
@@
Roo.Template.prototype = {
* @cfg {String} html The HTML fragment or an array of fragments to join("") or multiple arguments to join("")
*/
html : '',
* @cfg {String} html The HTML fragment or an array of fragments to join("") or multiple arguments to join("")
*/
html : '',
+
+
+ compiled : false,
+ loaded : false,
/**
* Returns an HTML fragment of this template with the specified values applied.
* @param {Object} values The template values. Can be an array if your params are numeric (i.e. {0}) or an object (i.e. {foo: 'bar'})
* @return {String} The HTML fragment
*/
/**
* Returns an HTML fragment of this template with the specified values applied.
* @param {Object} values The template values. Can be an array if your params are numeric (i.e. {0}) or an object (i.e. {foo: 'bar'})
* @return {String} The HTML fragment
*/
+
+
+
applyTemplate : function(values){
//Roo.log(["applyTemplate", values]);
try {
applyTemplate : function(values){
//Roo.log(["applyTemplate", values]);
try {
@@
-4758,11
+4765,12
@@
Roo.Template.prototype = {
method : 'GET',
success : function (response) {
_t.loading = false;
method : 'GET',
success : function (response) {
_t.loading = false;
- _t.html = response.responseText;
_t.url = false;
_t.url = false;
- _t.compile();
+
+ _t.set(response.responseText,true);
+ _t.loaded = true;
if (_t.onLoad) {
if (_t.onLoad) {
- _t.on
l
oad();
+ _t.on
L
oad();
}
},
failure : function(response) {
}
},
failure : function(response) {
@@
-4780,7
+4788,7
@@
Roo.Template.prototype = {
*/
set : function(html, compile){
this.html = html;
*/
set : function(html, compile){
this.html = html;
- this.compiled =
null
;
+ this.compiled =
false
;
if(compile){
this.compile();
}
if(compile){
this.compile();
}
@@
-22556,7
+22564,7
@@
Roo.dd.DropTarget = function(el, config){
* target. This default implementation adds the CSS class specified by overClass (if any) to the drop element
* and returns the dropAllowed config value. This method should be overridden if drop validation is required.
*
* target. This default implementation adds the CSS class specified by overClass (if any) to the drop element
* and returns the dropAllowed config value. This method should be overridden if drop validation is required.
*
- * IMPORTANT : it should set
this.overClass and this.dropAllowed
+ * IMPORTANT : it should set
this.valid to true|false
*
* @param {Roo.dd.DragSource} source The drag source that was dragged over this drop target
* @param {Event} e The event
*
* @param {Roo.dd.DragSource} source The drag source that was dragged over this drop target
* @param {Event} e The event
@@
-22570,7
+22578,7
@@
Roo.dd.DropTarget = function(el, config){
* This method will be called on every mouse movement while the drag source is over the drop target.
* This default implementation simply returns the dropAllowed config value.
*
* This method will be called on every mouse movement while the drag source is over the drop target.
* This default implementation simply returns the dropAllowed config value.
*
- * IMPORTANT : it should set
this.dropAllowed
+ * IMPORTANT : it should set
this.valid to true|false
*
* @param {Roo.dd.DragSource} source The drag source that was dragged over this drop target
* @param {Event} e The event
*
* @param {Roo.dd.DragSource} source The drag source that was dragged over this drop target
* @param {Event} e The event
@@
-22584,6
+22592,7
@@
Roo.dd.DropTarget = function(el, config){
* out of the target without dropping. This default implementation simply removes the CSS class specified by
* overClass (if any) from the drop element.
*
* out of the target without dropping. This default implementation simply removes the CSS class specified by
* overClass (if any) from the drop element.
*
+ *
* @param {Roo.dd.DragSource} source The drag source that was dragged over this drop target
* @param {Event} e The event
* @param {Object} data An object containing arbitrary data supplied by the drag source
* @param {Roo.dd.DragSource} source The drag source that was dragged over this drop target
* @param {Event} e The event
* @param {Object} data An object containing arbitrary data supplied by the drag source
@@
-45215,8
+45224,8
@@
Roo.HtmlEditorCore.cblack= [
Roo.HtmlEditorCore.swapCodes =[
Roo.HtmlEditorCore.swapCodes =[
- [ 8211, "
--
" ],
- [ 8212, "
--
" ],
+ [ 8211, "
–
" ],
+ [ 8212, "
—
" ],
[ 8216, "'" ],
[ 8217, "'" ],
[ 8220, '"' ],
[ 8216, "'" ],
[ 8217, "'" ],
[ 8220, '"' ],
@@
-51462,10
+51471,10
@@
Roo.DDView = function(container, tpl, config) {
this.getEl().setStyle("outline", "0px none");
this.getEl().unselectable();
if (this.dragGroup) {
this.getEl().setStyle("outline", "0px none");
this.getEl().unselectable();
if (this.dragGroup) {
-
this.setDraggable(this.dragGroup.split(","));
+ this.setDraggable(this.dragGroup.split(","));
}
if (this.dropGroup) {
}
if (this.dropGroup) {
-
this.setDroppable(this.dropGroup.split(","));
+ this.setDroppable(this.dropGroup.split(","));
}
if (this.deletable) {
this.setDeletable();
}
if (this.deletable) {
this.setDeletable();
@@
-55399,6
+55408,9
@@
Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
/**
* @cfg {String} ddGroup - drag drop group.
*/
/**
* @cfg {String} ddGroup - drag drop group.
*/
+ /**
+ * @cfg {String} dragGroup - drag group (?? not sure if needed.)
+ */
/**
* @cfg {Number} minColumnWidth The minimum width a column can be resized to. Default is 25.
/**
* @cfg {Number} minColumnWidth The minimum width a column can be resized to. Default is 25.
@@
-55435,6
+55447,9
@@
Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
/**
* @cfg {Boolean} enableDrag True to enable drag of rows. Default is false. (double check if this is needed?)
/**
* @cfg {Boolean} enableDrag True to enable drag of rows. Default is false. (double check if this is needed?)
+ */
+ /**
+ * @cfg {Boolean} enableDrop True to enable drop of elements. Default is false. (double check if this is needed?)
*/
/**
*/
/**
@@
-55509,6
+55524,15
@@
Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
/**
* @cfg {Number} maxHeight Sets the maximum height of the grid - ignored if autoHeight is not on.
*/
/**
* @cfg {Number} maxHeight Sets the maximum height of the grid - ignored if autoHeight is not on.
*/
+
+
+ /**
+ * @cfg {String} ddText Configures the text is the drag proxy (defaults to "%0 selected row(s)").
+ * %0 is replaced with the number of selected rows.
+ */
+ ddText : "{0} selected row{1}",
+
+
/**
* Called once after all setup has been completed and the grid is ready to be rendered.
* @return {Roo.grid.Grid} this
/**
* Called once after all setup has been completed and the grid is ready to be rendered.
* @return {Roo.grid.Grid} this
@@
-55824,6
+55848,7
@@
Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
},
/**
* Called to get grid's drag proxy text, by default returns this.ddText.
},
/**
* Called to get grid's drag proxy text, by default returns this.ddText.
+ * Override this to put something different in the dragged text.
* @return {String}
*/
getDragDropText : function(){
* @return {String}
*/
getDragDropText : function(){
@@
-55831,12
+55856,7
@@
Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
return String.format(this.ddText, count, count == 1 ? '' : 's');
}
});
return String.format(this.ddText, count, count == 1 ? '' : 's');
}
});
-/**
- * Configures the text is the drag proxy (defaults to "%0 selected row(s)").
- * %0 is replaced with the number of selected rows.
- * @type String
- */
-Roo.grid.Grid.prototype.ddText = "{0} selected row{1}";/*
+/*
* Based on:
* Ext JS Library 1.1.1
* Copyright(c) 2006-2007, Ext JS, LLC.
* Based on:
* Ext JS Library 1.1.1
* Copyright(c) 2006-2007, Ext JS, LLC.
@@
-57746,7
+57766,8
@@
Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, {
}
},
}
},
- layout : function(initialRender, is2ndPass){
+ layout : function(initialRender, is2ndPass)
+ {
var g = this.grid;
var auto = g.autoHeight;
var scrollOffset = 16;
var g = this.grid;
var auto = g.autoHeight;
var scrollOffset = 16;
@@
-58005,7
+58026,12
@@
Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
}
}
}
}
+ if (sm.getSelections && sm.getSelections().length < 1) {
+ return false;
+ }
+
+ // before it used to all dragging of unseleted... - now we dont do that.
if(rowIndex !== false){
// if editorgrid..
if(rowIndex !== false){
// if editorgrid..
@@
-58026,14
+58052,14
@@
Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
grid: this.grid,
ddel: this.ddel,
rowIndex: rowIndex,
grid: this.grid,
ddel: this.ddel,
rowIndex: rowIndex,
- selections:sm.getSelections ? sm.getSelections() : (
- sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []
- )
+ selections: sm.getSelections ? sm.getSelections() : (
+ sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : [])
};
}
return false;
},
};
}
return false;
},
-
+
+
onInitDrag : function(e){
var data = this.dragData;
this.ddel.innerHTML = this.grid.getDragDropText();
onInitDrag : function(e){
var data = this.dragData;
this.ddel.innerHTML = this.grid.getDragDropText();