check ifdef for bootstrap version

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index e6c52cc..48a8ef5 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -7,7 +7,7 @@ Roo.bootstrap.version = (
         function() {
                 var ret=3;
                 Roo.each(document.styleSheets, function(s) {
-                    if (s.href.match(/css-bootstrap4/)) {
+                    if (typeof(s.href) != 'undefined' && s.href.match(/css-bootstrap4/)) {
                         ret=4;
                     }
                 });
@@ -2651,6 +2651,8 @@ Roo.extend(Roo.bootstrap.MenuSeparator, Roo.bootstrap.Component,  {
  * @cfg {Boolean} animate default true
  * @cfg {Boolean} allow_close default true
  * @cfg {Boolean} fitwindow default false
+ * @cfg {Number} width fixed width - usefull for chrome extension only really.
+ * @cfg {Number} height fixed height - usefull for chrome extension only really.
  * @cfg {String} size (sm|lg) default empty
  * @cfg {Number} max_width set the max width of modal
  *
@@ -23158,11 +23160,17 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
                 node.nodeName == 'SPAN' &&
                 !node.hasAttributes() &&
                 node.childNodes.length == 1 &&
-                node.firstChild.nodeName == "#text"
+                node.firstChild.nodeName == "#text"  
         ) {
             var textNode = node.firstChild;
             node.removeChild(textNode);
+            if (node.getAttribute('lang') != 'zh-CN') {   // do not space pad on chinese characters..
+                node.parentNode.insertBefore(node.ownerDocument.createTextNode(" "), node);
+            }
             node.parentNode.insertBefore(textNode, node);
+            if (node.getAttribute('lang') != 'zh-CN') {   // do not space pad on chinese characters..
+                node.parentNode.insertBefore(node.ownerDocument.createTextNode(" ") , node);
+            }
             node.parentNode.removeChild(node);
         }