try and get ctrl-enter to add a clear all

diff --git a/Roo/htmleditor/KeyEnter.js b/Roo/htmleditor/KeyEnter.js
index 5eb5eb0..cf96958 100644 (file)
--- a/Roo/htmleditor/KeyEnter.js
+++ b/Roo/htmleditor/KeyEnter.js
@@ -45,9 +45,10 @@ Roo.htmleditor.KeyEnter.prototype = {
         var pli = range.closest('li');
         if (!pc || e.ctrlKey) {
             // on it list, or ctrl pressed.
-            if (pc) {
+            if (!e.ctrlKey) {
                 sel.insertNode('br', 'after'); 
             } else {
+                // only do this if we have ctrl key..
                 var br = doc.createElement('br');
                 br.className = 'clear';
                 br.setAttribute('style', 'clear:all');

diff --git a/roojs-all.js b/roojs-all.js
index 110d4ba..529cd09 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1979,7 +1979,7 @@ C=C||this.namedEntities;return A.replace(B?this.attrsCharsRegExp:this.textCharsR
 while(i--){C[A[i]]={};}return C;}};Roo.htmleditor.TidyEntities.init();
 // Roo/htmleditor/KeyEnter.js
 Roo.htmleditor.KeyEnter=function(A){Roo.apply(this,A);Roo.get(this.core.doc.body).on('keypress',this.keypress,this);};Roo.htmleditor.KeyEnter.prototype={core:false,keypress:function(e){if(e.charCode!=13&&e.charCode!=10){Roo.log([e.charCode,e]);return true;
-}e.preventDefault();var A=this.core.doc;var B=this.core.getSelection();var C=B.getRangeAt(0);var n=C.commonAncestorContainer;var pc=C.closest(['ol','ul']);var D=C.closest('li');if(!pc||e.ctrlKey){if(pc){B.insertNode('br','after');}else{var br=A.createElement('br');
+}e.preventDefault();var A=this.core.doc;var B=this.core.getSelection();var C=B.getRangeAt(0);var n=C.commonAncestorContainer;var pc=C.closest(['ol','ul']);var D=C.closest('li');if(!pc||e.ctrlKey){if(!e.ctrlKey){B.insertNode('br','after');}else{var br=A.createElement('br');
 br.className='clear';br.setAttribute('style','clear:all');B.insertNode(br,'after');}this.core.undoManager.addEvent();this.core.fireEditorEvent(e);return false;}if(D.innerText.trim()==''&&D.previousSibling&&D.previousSibling.nodeName=='LI'&&D.previousSibling.innerText.trim()==''){D.parentNode.removeChild(D.previousSibling);
 B.cursorAfter(pc);this.core.undoManager.addEvent();this.core.fireEditorEvent(e);return false;}var li=A.createElement('LI');li.innerHTML=' ';if(!D||!D.firstSibling){pc.appendChild(li);}else{D.parentNode.insertBefore(li,D.firstSibling);}B.cursorText(li.firstChild);
 this.core.undoManager.addEvent();this.core.fireEditorEvent(e);return false;}};

diff --git a/roojs-debug.js b/roojs-debug.js
index 6d5c6fc..b458a11 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -47812,9 +47812,10 @@ Roo.htmleditor.KeyEnter.prototype = {
         var pli = range.closest('li');
         if (!pc || e.ctrlKey) {
             // on it list, or ctrl pressed.
-            if (pc) {
+            if (!e.ctrlKey) {
                 sel.insertNode('br', 'after'); 
             } else {
+                // only do this if we have ctrl key..
                 var br = doc.createElement('br');
                 br.className = 'clear';
                 br.setAttribute('style', 'clear:all');

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 9b5db1e..7184449 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -23320,9 +23320,10 @@ Roo.htmleditor.KeyEnter.prototype = {
         var pli = range.closest('li');
         if (!pc || e.ctrlKey) {
             // on it list, or ctrl pressed.
-            if (pc) {
+            if (!e.ctrlKey) {
                 sel.insertNode('br', 'after'); 
             } else {
+                // only do this if we have ctrl key..
                 var br = doc.createElement('br');
                 br.className = 'clear';
                 br.setAttribute('style', 'clear:all');

diff --git a/roojs-ui.js b/roojs-ui.js
index 5b047d8..8cdf158 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1033,7 +1033,7 @@ C=C||this.namedEntities;return A.replace(B?this.attrsCharsRegExp:this.textCharsR
 while(i--){C[A[i]]={};}return C;}};Roo.htmleditor.TidyEntities.init();
 // Roo/htmleditor/KeyEnter.js
 Roo.htmleditor.KeyEnter=function(A){Roo.apply(this,A);Roo.get(this.core.doc.body).on('keypress',this.keypress,this);};Roo.htmleditor.KeyEnter.prototype={core:false,keypress:function(e){if(e.charCode!=13&&e.charCode!=10){Roo.log([e.charCode,e]);return true;
-}e.preventDefault();var A=this.core.doc;var B=this.core.getSelection();var C=B.getRangeAt(0);var n=C.commonAncestorContainer;var pc=C.closest(['ol','ul']);var D=C.closest('li');if(!pc||e.ctrlKey){if(pc){B.insertNode('br','after');}else{var br=A.createElement('br');
+}e.preventDefault();var A=this.core.doc;var B=this.core.getSelection();var C=B.getRangeAt(0);var n=C.commonAncestorContainer;var pc=C.closest(['ol','ul']);var D=C.closest('li');if(!pc||e.ctrlKey){if(!e.ctrlKey){B.insertNode('br','after');}else{var br=A.createElement('br');
 br.className='clear';br.setAttribute('style','clear:all');B.insertNode(br,'after');}this.core.undoManager.addEvent();this.core.fireEditorEvent(e);return false;}if(D.innerText.trim()==''&&D.previousSibling&&D.previousSibling.nodeName=='LI'&&D.previousSibling.innerText.trim()==''){D.parentNode.removeChild(D.previousSibling);
 B.cursorAfter(pc);this.core.undoManager.addEvent();this.core.fireEditorEvent(e);return false;}var li=A.createElement('LI');li.innerHTML=' ';if(!D||!D.firstSibling){pc.appendChild(li);}else{D.parentNode.insertBefore(li,D.firstSibling);}B.cursorText(li.firstChild);
 this.core.undoManager.addEvent();this.core.fireEditorEvent(e);return false;}};