From 036d4d8eeca188ac57485a63939eb161f989b356 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 12 Mar 2021 10:34:38 +0800 Subject: [PATCH] sync --- docs/json/roodata.json | 64 +++++++++++++++++++++++-- docs/src/Roo_DDView.js.html | 4 +- docs/src/Roo_HtmlEditorCore.js.html | 4 +- docs/src/Roo_dd_DropTarget.js.html | 5 +- docs/src/Roo_grid_Grid.js.html | 23 ++++++--- docs/src/Roo_grid_GridView.js.html | 3 +- docs/symbols/Roo.dd.DropTarget.json | 4 +- docs/symbols/Roo.dd.DropZone.json | 4 +- docs/symbols/Roo.grid.EditorGrid.json | 29 +++++++++-- docs/symbols/Roo.grid.Grid.json | 31 ++++++++++-- docs/symbols/Roo.grid.PropertyGrid.json | 29 +++++++++-- roojs-all.js | 2 +- roojs-bootstrap-debug.js | 4 +- roojs-bootstrap.js | 2 +- roojs-debug.js | 4 +- roojs-ui-debug.js | 4 +- roojs-ui.js | 2 +- 17 files changed, 174 insertions(+), 44 deletions(-) diff --git a/docs/json/roodata.json b/docs/json/roodata.json index f1a1f561c7..5e9f9c272d 100644 --- a/docs/json/roodata.json +++ b/docs/json/roodata.json @@ -74300,7 +74300,7 @@ { "name" : "enter", "type" : "function", - "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.overClass and this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.valid to true|false", "sig" : "function (source, e, data)\n{\n\n}", "memberOf" : "" }, @@ -74314,7 +74314,7 @@ { "name" : "over", "type" : "function", - "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.valid to true|false", "sig" : "function (source, e, data)\n{\n\n}", "memberOf" : "" } @@ -74826,7 +74826,7 @@ { "name" : "enter", "type" : "function", - "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.overClass and this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.valid to true|false", "sig" : "function (source, e, data)\n{\n\n}", "memberOf" : "Roo.dd.DropTarget" }, @@ -74840,7 +74840,7 @@ { "name" : "over", "type" : "function", - "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.valid to true|false", "sig" : "function (source, e, data)\n{\n\n}", "memberOf" : "Roo.dd.DropTarget" } @@ -97512,6 +97512,18 @@ "desc" : "- drag drop group.", "memberOf" : "Roo.grid.Grid" }, + { + "name" : "ddText", + "type" : "String", + "desc" : "Configures the text is the drag proxy (defaults to \"%0 selected row(s)\").\n%0 is replaced with the number of selected rows.", + "memberOf" : "Roo.grid.Grid" + }, + { + "name" : "dragGroup", + "type" : "String", + "desc" : "- drag group (?? not sure if needed.)", + "memberOf" : "Roo.grid.Grid" + }, { "name" : "dropTarget", "type" : "Roo.dd.DropTarget", @@ -97542,6 +97554,12 @@ "desc" : "True to enable drag and drop of rows. Default is false.", "memberOf" : "Roo.grid.Grid" }, + { + "name" : "enableDrop", + "type" : "Boolean", + "desc" : "True to enable drop of elements. Default is false. (double check if this is needed?)", + "memberOf" : "Roo.grid.Grid" + }, { "name" : "enableRowHeightSync", "type" : "Boolean", @@ -98066,6 +98084,18 @@ "desc" : "- drag drop group.", "memberOf" : "" }, + { + "name" : "ddText", + "type" : "String", + "desc" : "Configures the text is the drag proxy (defaults to \"%0 selected row(s)\").\n%0 is replaced with the number of selected rows.", + "memberOf" : "" + }, + { + "name" : "dragGroup", + "type" : "String", + "desc" : "- drag group (?? not sure if needed.)", + "memberOf" : "" + }, { "name" : "dropTarget", "type" : "Roo.dd.DropTarget", @@ -98096,6 +98126,12 @@ "desc" : "True to enable drag and drop of rows. Default is false.", "memberOf" : "" }, + { + "name" : "enableDrop", + "type" : "Boolean", + "desc" : "True to enable drop of elements. Default is false. (double check if this is needed?)", + "memberOf" : "" + }, { "name" : "enableRowHeightSync", "type" : "Boolean", @@ -98438,7 +98474,7 @@ { "name" : "getDragDropText", "type" : "function", - "desc" : "Called to get grid's drag proxy text, by default returns this.ddText.", + "desc" : "Called to get grid's drag proxy text, by default returns this.ddText.\nOverride this to put something different in the dragged text.", "sig" : "()\n{\n\n}", "static" : false, "memberOf" : "" @@ -99227,6 +99263,18 @@ "desc" : "- drag drop group.", "memberOf" : "Roo.grid.Grid" }, + { + "name" : "ddText", + "type" : "String", + "desc" : "Configures the text is the drag proxy (defaults to \"%0 selected row(s)\").\n%0 is replaced with the number of selected rows.", + "memberOf" : "Roo.grid.Grid" + }, + { + "name" : "dragGroup", + "type" : "String", + "desc" : "- drag group (?? not sure if needed.)", + "memberOf" : "Roo.grid.Grid" + }, { "name" : "dropTarget", "type" : "Roo.dd.DropTarget", @@ -99257,6 +99305,12 @@ "desc" : "True to enable drag and drop of rows. Default is false.", "memberOf" : "Roo.grid.Grid" }, + { + "name" : "enableDrop", + "type" : "Boolean", + "desc" : "True to enable drop of elements. Default is false. (double check if this is needed?)", + "memberOf" : "Roo.grid.Grid" + }, { "name" : "enableRowHeightSync", "type" : "Boolean", diff --git a/docs/src/Roo_DDView.js.html b/docs/src/Roo_DDView.js.html index fa3f9546d9..291fc7cfe2 100644 --- a/docs/src/Roo_DDView.js.html +++ b/docs/src/Roo_DDView.js.html @@ -28,10 +28,10 @@ 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) { - this.setDroppable(this.dropGroup.split(",")); + this.setDroppable(this.dropGroup.split(",")); } if (this.deletable) { this.setDeletable(); diff --git a/docs/src/Roo_HtmlEditorCore.js.html b/docs/src/Roo_HtmlEditorCore.js.html index 5448904911..41e1e51260 100644 --- a/docs/src/Roo_HtmlEditorCore.js.html +++ b/docs/src/Roo_HtmlEditorCore.js.html @@ -1726,8 +1726,8 @@ Roo.HtmlEditorCore.swapCodes =[ - [ 8211, "--" ], - [ 8212, "--" ], + [ 8211, "–" ], + [ 8212, "—" ], [ 8216, "'" ], [ 8217, "'" ], [ 8220, '"' ], diff --git a/docs/src/Roo_dd_DropTarget.js.html b/docs/src/Roo_dd_DropTarget.js.html index a4a1ba4ff4..2b6adcff44 100644 --- a/docs/src/Roo_dd_DropTarget.js.html +++ b/docs/src/Roo_dd_DropTarget.js.html @@ -43,7 +43,7 @@ * 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 @@ -57,7 +57,7 @@ * 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 @@ -71,6 +71,7 @@ * 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 diff --git a/docs/src/Roo_grid_Grid.js.html b/docs/src/Roo_grid_Grid.js.html index d43e8c4895..48374d60fb 100644 --- a/docs/src/Roo_grid_Grid.js.html +++ b/docs/src/Roo_grid_Grid.js.html @@ -320,6 +320,9 @@ /** * @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. @@ -356,6 +359,9 @@ /** * @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?) */ /** @@ -430,7 +436,16 @@ /** * @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 */ @@ -745,6 +760,7 @@ }, /** * 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(){ @@ -752,9 +768,4 @@ 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}"; \ No newline at end of file + \ No newline at end of file diff --git a/docs/src/Roo_grid_GridView.js.html b/docs/src/Roo_grid_GridView.js.html index ab5772172a..87b5c7197a 100644 --- a/docs/src/Roo_grid_GridView.js.html +++ b/docs/src/Roo_grid_GridView.js.html @@ -1593,7 +1593,8 @@ } }, - layout : function(initialRender, is2ndPass){ + layout : function(initialRender, is2ndPass) + { var g = this.grid; var auto = g.autoHeight; var scrollOffset = 16; diff --git a/docs/symbols/Roo.dd.DropTarget.json b/docs/symbols/Roo.dd.DropTarget.json index 3b7a6a1d21..50c82b01ab 100644 --- a/docs/symbols/Roo.dd.DropTarget.json +++ b/docs/symbols/Roo.dd.DropTarget.json @@ -1387,7 +1387,7 @@ }, { "name" : "over", - "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.valid to true|false", "memberOf" : "Roo.dd.DropTarget", "example" : "", "deprecated" : "", @@ -1417,7 +1417,7 @@ }, { "name" : "enter", - "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.overClass and this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.valid to true|false", "memberOf" : "Roo.dd.DropTarget", "example" : "", "deprecated" : "", diff --git a/docs/symbols/Roo.dd.DropZone.json b/docs/symbols/Roo.dd.DropZone.json index 4558d7cb94..517eae343b 100644 --- a/docs/symbols/Roo.dd.DropZone.json +++ b/docs/symbols/Roo.dd.DropZone.json @@ -1755,7 +1755,7 @@ }, { "name" : "over", - "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls continuously while it is being dragged over the target.\nThis method will be called on every mouse movement while the drag source is over the drop target.\nThis default implementation simply returns the dropAllowed config value.\n\nIMPORTANT : it should set this.valid to true|false", "memberOf" : "Roo.dd.DropTarget", "example" : "", "deprecated" : "", @@ -1785,7 +1785,7 @@ }, { "name" : "enter", - "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.overClass and this.dropAllowed", + "desc" : "The function a {@link Roo.dd.DragSource} calls once to notify this drop target that the source is now over the\ntarget. This default implementation adds the CSS class specified by overClass (if any) to the drop element\nand returns the dropAllowed config value. This method should be overridden if drop validation is required.\n\nIMPORTANT : it should set this.valid to true|false", "memberOf" : "Roo.dd.DropTarget", "example" : "", "deprecated" : "", diff --git a/docs/symbols/Roo.grid.EditorGrid.json b/docs/symbols/Roo.grid.EditorGrid.json index c71a990150..ea36c9df12 100644 --- a/docs/symbols/Roo.grid.EditorGrid.json +++ b/docs/symbols/Roo.grid.EditorGrid.json @@ -63,6 +63,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "ddText", + "type" : "String", + "desc" : "Configures the text is the drag proxy (defaults to \"%0 selected row(s)\").\n%0 is replaced with the number of selected rows.", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "autoExpandColumn", "type" : "String", @@ -84,6 +91,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "enableDrop", + "type" : "Boolean", + "desc" : "True to enable drop of elements. Default is false. (double check if this is needed?)", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "monitorWindowResize", "type" : "Boolean", @@ -106,9 +120,9 @@ "optvals" : [] }, { - "name" : "autoWidth", + "name" : "enableDrag", "type" : "Boolean", - "desc" : "True to set the grid's width to the default total width of the grid's columns instead\nof a fixed width. Default is false.", + "desc" : "True to enable drag of rows. Default is false. (double check if this is needed?)", "memberOf" : "Roo.grid.Grid", "optvals" : [] }, @@ -120,9 +134,9 @@ "optvals" : [] }, { - "name" : "enableDrag", + "name" : "autoWidth", "type" : "Boolean", - "desc" : "True to enable drag of rows. Default is false. (double check if this is needed?)", + "desc" : "True to set the grid's width to the default total width of the grid's columns instead\nof a fixed width. Default is false.", "memberOf" : "Roo.grid.Grid", "optvals" : [] }, @@ -196,6 +210,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "dragGroup", + "type" : "String", + "desc" : "- drag group (?? not sure if needed.)", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "autoHeight", "type" : "Boolean", diff --git a/docs/symbols/Roo.grid.Grid.json b/docs/symbols/Roo.grid.Grid.json index 6fd0b3128c..f8492f64e6 100644 --- a/docs/symbols/Roo.grid.Grid.json +++ b/docs/symbols/Roo.grid.Grid.json @@ -56,6 +56,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "ddText", + "type" : "String", + "desc" : "Configures the text is the drag proxy (defaults to \"%0 selected row(s)\").\n%0 is replaced with the number of selected rows.", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "autoExpandColumn", "type" : "String", @@ -77,6 +84,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "enableDrop", + "type" : "Boolean", + "desc" : "True to enable drop of elements. Default is false. (double check if this is needed?)", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "monitorWindowResize", "type" : "Boolean", @@ -99,9 +113,9 @@ "optvals" : [] }, { - "name" : "autoWidth", + "name" : "enableDrag", "type" : "Boolean", - "desc" : "True to set the grid's width to the default total width of the grid's columns instead\nof a fixed width. Default is false.", + "desc" : "True to enable drag of rows. Default is false. (double check if this is needed?)", "memberOf" : "Roo.grid.Grid", "optvals" : [] }, @@ -113,9 +127,9 @@ "optvals" : [] }, { - "name" : "enableDrag", + "name" : "autoWidth", "type" : "Boolean", - "desc" : "True to enable drag of rows. Default is false. (double check if this is needed?)", + "desc" : "True to set the grid's width to the default total width of the grid's columns instead\nof a fixed width. Default is false.", "memberOf" : "Roo.grid.Grid", "optvals" : [] }, @@ -182,6 +196,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "dragGroup", + "type" : "String", + "desc" : "- drag group (?? not sure if needed.)", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "autoHeight", "type" : "Boolean", @@ -328,7 +349,7 @@ }, { "name" : "getDragDropText", - "desc" : "Called to get grid's drag proxy text, by default returns this.ddText.", + "desc" : "Called to get grid's drag proxy text, by default returns this.ddText.\nOverride this to put something different in the dragged text.", "isStatic" : false, "isConstructor" : false, "isPrivate" : false, diff --git a/docs/symbols/Roo.grid.PropertyGrid.json b/docs/symbols/Roo.grid.PropertyGrid.json index 775a9c4378..79c84bee48 100644 --- a/docs/symbols/Roo.grid.PropertyGrid.json +++ b/docs/symbols/Roo.grid.PropertyGrid.json @@ -65,6 +65,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "ddText", + "type" : "String", + "desc" : "Configures the text is the drag proxy (defaults to \"%0 selected row(s)\").\n%0 is replaced with the number of selected rows.", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "autoExpandColumn", "type" : "String", @@ -93,6 +100,13 @@ "memberOf" : "Roo.grid.PropertyGrid", "optvals" : [] }, + { + "name" : "enableDrop", + "type" : "Boolean", + "desc" : "True to enable drop of elements. Default is false. (double check if this is needed?)", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "monitorWindowResize", "type" : "Boolean", @@ -115,9 +129,9 @@ "optvals" : [] }, { - "name" : "autoWidth", + "name" : "enableDrag", "type" : "Boolean", - "desc" : "True to set the grid's width to the default total width of the grid's columns instead\nof a fixed width. Default is false.", + "desc" : "True to enable drag of rows. Default is false. (double check if this is needed?)", "memberOf" : "Roo.grid.Grid", "optvals" : [] }, @@ -129,9 +143,9 @@ "optvals" : [] }, { - "name" : "enableDrag", + "name" : "autoWidth", "type" : "Boolean", - "desc" : "True to enable drag of rows. Default is false. (double check if this is needed?)", + "desc" : "True to set the grid's width to the default total width of the grid's columns instead\nof a fixed width. Default is false.", "memberOf" : "Roo.grid.Grid", "optvals" : [] }, @@ -205,6 +219,13 @@ "memberOf" : "Roo.grid.Grid", "optvals" : [] }, + { + "name" : "dragGroup", + "type" : "String", + "desc" : "- drag group (?? not sure if needed.)", + "memberOf" : "Roo.grid.Grid", + "optvals" : [] + }, { "name" : "autoHeight", "type" : "Boolean", diff --git a/roojs-all.js b/roojs-all.js index f0f281ebef..b3a85aabd0 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1862,7 +1862,7 @@ Roo.each(Roo.HtmlEditorCore.cwhite,function(A){if(b.indexOf(A)>-1){return;}this. );return;}var B=this;Roo.each(A,function(s){if(!s.length){return;}Roo.get(B.iframe.contentDocument.head).createChild({tag:'link',rel:'stylesheet',type:'text/css',href:s});});},removeStylesheets:function(){var A=this;Roo.each(Roo.get(A.iframe.contentDocument.head).select('link[rel=stylesheet]',true).elements,function(s){s.remove(); });},setStyle:function(A){Roo.get(this.iframe.contentDocument.head).createChild({tag:'style',type:'text/css',html:A});return;}});Roo.HtmlEditorCore.white=['area','br','img','input','hr','wbr','address','blockquote','center','dd','dir','div','dl','dt','h1','h2','h3','h4','h5','h6','hr','isindex','listing','marquee','menu','multicol','ol','p','plaintext','pre','table','ul','xmp','caption','col','colgroup','tbody','td','tfoot','th','thead','tr','dir','menu','ol','ul','dl','embed','object']; Roo.HtmlEditorCore.black=['applet','base','basefont','bgsound','blink','body','frame','frameset','head','html','ilayer','iframe','layer','link','meta','object','script','style','title','xml'];Roo.HtmlEditorCore.clean=['script','style','title','xml'];Roo.HtmlEditorCore.remove=['font']; -Roo.HtmlEditorCore.ablack=['on'];Roo.HtmlEditorCore.aclean=['action','background','codebase','dynsrc','href','lowsrc'];Roo.HtmlEditorCore.pwhite=['http','https','mailto'];Roo.HtmlEditorCore.cwhite=[];Roo.HtmlEditorCore.cblack=[];Roo.HtmlEditorCore.swapCodes=[[8211,"--"],[8212,"--"],[8216,"'"],[8217,"'"],[8220,'"'],[8221,'"'],[8226,"*"],[8230,"..."]]; +Roo.HtmlEditorCore.ablack=['on'];Roo.HtmlEditorCore.aclean=['action','background','codebase','dynsrc','href','lowsrc'];Roo.HtmlEditorCore.pwhite=['http','https','mailto'];Roo.HtmlEditorCore.cwhite=[];Roo.HtmlEditorCore.cblack=[];Roo.HtmlEditorCore.swapCodes=[[8211,"–"],[8212,"—"],[8216,"'"],[8217,"'"],[8220,'"'],[8221,'"'],[8226,"*"],[8230,"..."]]; // Roo/form/HtmlEditor.js Roo.form.HtmlEditor=function(A){Roo.form.HtmlEditor.superclass.constructor.call(this,A);if(!this.toolbars){this.toolbars=[];}this.editorcore=new Roo.HtmlEditorCore(Roo.apply({owner:this},A));};Roo.extend(Roo.form.HtmlEditor,Roo.form.Field,{clearUp:true,toolbars:false,resizable:false,height:300,width:500,stylesheets:false,cblack:false,cwhite:false,black:false,white:false,frameId:false,validationEvent:false,deferHeight:true,initialized:false,activated:false,onFocus:Roo.emptyFn,iframePad:3,hideMode:'offsets',actionMode:'container',defaultAutoCreate:{tag:"textarea",style:"width:500px;height:300px;",autocomplete:"new-password"} diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 163ac1f20f..8c98bb0c2b 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -25829,8 +25829,8 @@ Roo.HtmlEditorCore.cblack= [ Roo.HtmlEditorCore.swapCodes =[ - [ 8211, "--" ], - [ 8212, "--" ], + [ 8211, "–" ], + [ 8212, "—" ], [ 8216, "'" ], [ 8217, "'" ], [ 8220, '"' ], diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index b2bb8a311d..e390e05121 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1085,7 +1085,7 @@ Roo.each(Roo.HtmlEditorCore.cwhite,function(A){if(b.indexOf(A)>-1){return;}this. );return;}var B=this;Roo.each(A,function(s){if(!s.length){return;}Roo.get(B.iframe.contentDocument.head).createChild({tag:'link',rel:'stylesheet',type:'text/css',href:s});});},removeStylesheets:function(){var A=this;Roo.each(Roo.get(A.iframe.contentDocument.head).select('link[rel=stylesheet]',true).elements,function(s){s.remove(); });},setStyle:function(A){Roo.get(this.iframe.contentDocument.head).createChild({tag:'style',type:'text/css',html:A});return;}});Roo.HtmlEditorCore.white=['area','br','img','input','hr','wbr','address','blockquote','center','dd','dir','div','dl','dt','h1','h2','h3','h4','h5','h6','hr','isindex','listing','marquee','menu','multicol','ol','p','plaintext','pre','table','ul','xmp','caption','col','colgroup','tbody','td','tfoot','th','thead','tr','dir','menu','ol','ul','dl','embed','object']; Roo.HtmlEditorCore.black=['applet','base','basefont','bgsound','blink','body','frame','frameset','head','html','ilayer','iframe','layer','link','meta','object','script','style','title','xml'];Roo.HtmlEditorCore.clean=['script','style','title','xml'];Roo.HtmlEditorCore.remove=['font']; -Roo.HtmlEditorCore.ablack=['on'];Roo.HtmlEditorCore.aclean=['action','background','codebase','dynsrc','href','lowsrc'];Roo.HtmlEditorCore.pwhite=['http','https','mailto'];Roo.HtmlEditorCore.cwhite=[];Roo.HtmlEditorCore.cblack=[];Roo.HtmlEditorCore.swapCodes=[[8211,"--"],[8212,"--"],[8216,"'"],[8217,"'"],[8220,'"'],[8221,'"'],[8226,"*"],[8230,"..."]]; +Roo.HtmlEditorCore.ablack=['on'];Roo.HtmlEditorCore.aclean=['action','background','codebase','dynsrc','href','lowsrc'];Roo.HtmlEditorCore.pwhite=['http','https','mailto'];Roo.HtmlEditorCore.cwhite=[];Roo.HtmlEditorCore.cblack=[];Roo.HtmlEditorCore.swapCodes=[[8211,"–"],[8212,"—"],[8216,"'"],[8217,"'"],[8220,'"'],[8221,'"'],[8226,"*"],[8230,"..."]]; // Roo/bootstrap/HtmlEditor.js Roo.bootstrap.HtmlEditor=function(A){Roo.bootstrap.HtmlEditor.superclass.constructor.call(this,A);if(!this.toolbars){this.toolbars=[];}this.editorcore=new Roo.HtmlEditorCore(Roo.apply({owner:this},A));this.addEvents({initialize:true,activate:true,beforesync:true,beforepush:true,sync:true,push:true,editmodechange:true,editorevent:true,firstfocus:true,autosave:true,savedpreview:true} diff --git a/roojs-debug.js b/roojs-debug.js index 197e32ca15..a99790444e 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -45224,8 +45224,8 @@ Roo.HtmlEditorCore.cblack= [ Roo.HtmlEditorCore.swapCodes =[ - [ 8211, "--" ], - [ 8212, "--" ], + [ 8211, "–" ], + [ 8212, "—" ], [ 8216, "'" ], [ 8217, "'" ], [ 8220, '"' ], diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index dffb102803..234ddca854 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -22219,8 +22219,8 @@ Roo.HtmlEditorCore.cblack= [ Roo.HtmlEditorCore.swapCodes =[ - [ 8211, "--" ], - [ 8212, "--" ], + [ 8211, "–" ], + [ 8212, "—" ], [ 8216, "'" ], [ 8217, "'" ], [ 8220, '"' ], diff --git a/roojs-ui.js b/roojs-ui.js index a4271a57f9..9c5f4e9d60 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -968,7 +968,7 @@ Roo.each(Roo.HtmlEditorCore.cwhite,function(A){if(b.indexOf(A)>-1){return;}this. );return;}var B=this;Roo.each(A,function(s){if(!s.length){return;}Roo.get(B.iframe.contentDocument.head).createChild({tag:'link',rel:'stylesheet',type:'text/css',href:s});});},removeStylesheets:function(){var A=this;Roo.each(Roo.get(A.iframe.contentDocument.head).select('link[rel=stylesheet]',true).elements,function(s){s.remove(); });},setStyle:function(A){Roo.get(this.iframe.contentDocument.head).createChild({tag:'style',type:'text/css',html:A});return;}});Roo.HtmlEditorCore.white=['area','br','img','input','hr','wbr','address','blockquote','center','dd','dir','div','dl','dt','h1','h2','h3','h4','h5','h6','hr','isindex','listing','marquee','menu','multicol','ol','p','plaintext','pre','table','ul','xmp','caption','col','colgroup','tbody','td','tfoot','th','thead','tr','dir','menu','ol','ul','dl','embed','object']; Roo.HtmlEditorCore.black=['applet','base','basefont','bgsound','blink','body','frame','frameset','head','html','ilayer','iframe','layer','link','meta','object','script','style','title','xml'];Roo.HtmlEditorCore.clean=['script','style','title','xml'];Roo.HtmlEditorCore.remove=['font']; -Roo.HtmlEditorCore.ablack=['on'];Roo.HtmlEditorCore.aclean=['action','background','codebase','dynsrc','href','lowsrc'];Roo.HtmlEditorCore.pwhite=['http','https','mailto'];Roo.HtmlEditorCore.cwhite=[];Roo.HtmlEditorCore.cblack=[];Roo.HtmlEditorCore.swapCodes=[[8211,"--"],[8212,"--"],[8216,"'"],[8217,"'"],[8220,'"'],[8221,'"'],[8226,"*"],[8230,"..."]]; +Roo.HtmlEditorCore.ablack=['on'];Roo.HtmlEditorCore.aclean=['action','background','codebase','dynsrc','href','lowsrc'];Roo.HtmlEditorCore.pwhite=['http','https','mailto'];Roo.HtmlEditorCore.cwhite=[];Roo.HtmlEditorCore.cblack=[];Roo.HtmlEditorCore.swapCodes=[[8211,"–"],[8212,"—"],[8216,"'"],[8217,"'"],[8220,'"'],[8221,'"'],[8226,"*"],[8230,"..."]]; // Roo/form/HtmlEditor.js Roo.form.HtmlEditor=function(A){Roo.form.HtmlEditor.superclass.constructor.call(this,A);if(!this.toolbars){this.toolbars=[];}this.editorcore=new Roo.HtmlEditorCore(Roo.apply({owner:this},A));};Roo.extend(Roo.form.HtmlEditor,Roo.form.Field,{clearUp:true,toolbars:false,resizable:false,height:300,width:500,stylesheets:false,cblack:false,cwhite:false,black:false,white:false,frameId:false,validationEvent:false,deferHeight:true,initialized:false,activated:false,onFocus:Roo.emptyFn,iframePad:3,hideMode:'offsets',actionMode:'container',defaultAutoCreate:{tag:"textarea",style:"width:500px;height:300px;",autocomplete:"new-password"} -- 2.39.2