fix br bug

appleple · Feb 6, 2018 · aaf3b84 · aaf3b84
1 parent ef70f99
commit aaf3b84
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/js/jquery-lite-editor.js b/js/jquery-lite-editor.js
@@ -12910,7 +12910,7 @@ var LiteEditor = function (_aTemplate) {
 
     if (selector.value) {
       var value = selector.value;
-      if (_this.data.sourceFirst) {
+      if (!_this.data.sourceFirst) {
         value = _this.makeEditableHtml(value);
       }
       if (_this.data.escapeNotRegisteredTags) {
@@ -13264,8 +13264,8 @@ var LiteEditor = function (_aTemplate) {
       data.canRedo = this.canRedo();
       if (data.firstValue) {
         data.formatedValue = this.data.firstValue;
-        data.firstValue = '';
-      } else {
+        data.firstValue = null;
+      } else if (!data.showSource) {
         data.formatedValue = this.format(data.value);
       }
       if (data.value) {
@@ -13551,6 +13551,9 @@ var LiteEditor = function (_aTemplate) {
     value: function toggleSource() {
       var source = this.data.showSource;
       this.data.showSource = !source;
+      if (this.data.showSource) {
+        this.data.formatedValue = this.format(this.data.value);
+      }
       this.update();
     }
   }, {

diff --git a/js/jquery-lite-editor.min.js b/js/jquery-lite-editor.min.js
diff --git a/js/lite-editor.js b/js/lite-editor.js
@@ -12885,7 +12885,7 @@ var LiteEditor = function (_aTemplate) {
 
     if (selector.value) {
       var value = selector.value;
-      if (_this.data.sourceFirst) {
+      if (!_this.data.sourceFirst) {
         value = _this.makeEditableHtml(value);
       }
       if (_this.data.escapeNotRegisteredTags) {
@@ -13239,8 +13239,8 @@ var LiteEditor = function (_aTemplate) {
       data.canRedo = this.canRedo();
       if (data.firstValue) {
         data.formatedValue = this.data.firstValue;
-        data.firstValue = '';
-      } else {
+        data.firstValue = null;
+      } else if (!data.showSource) {
         data.formatedValue = this.format(data.value);
       }
       if (data.value) {
@@ -13526,6 +13526,9 @@ var LiteEditor = function (_aTemplate) {
     value: function toggleSource() {
       var source = this.data.showSource;
       this.data.showSource = !source;
+      if (this.data.showSource) {
+        this.data.formatedValue = this.format(this.data.value);
+      }
       this.update();
     }
   }, {

diff --git a/js/lite-editor.min.js b/js/lite-editor.min.js
diff --git a/lib/core/index.js b/lib/core/index.js
@@ -174,7 +174,7 @@ var LiteEditor = function (_aTemplate) {
 
     if (selector.value) {
       var value = selector.value;
-      if (_this.data.sourceFirst) {
+      if (!_this.data.sourceFirst) {
         value = _this.makeEditableHtml(value);
       }
       if (_this.data.escapeNotRegisteredTags) {
@@ -528,8 +528,8 @@ var LiteEditor = function (_aTemplate) {
       data.canRedo = this.canRedo();
       if (data.firstValue) {
         data.formatedValue = this.data.firstValue;
-        data.firstValue = '';
-      } else {
+        data.firstValue = null;
+      } else if (!data.showSource) {
         data.formatedValue = this.format(data.value);
       }
       if (data.value) {
@@ -815,6 +815,9 @@ var LiteEditor = function (_aTemplate) {
     value: function toggleSource() {
       var source = this.data.showSource;
       this.data.showSource = !source;
+      if (this.data.showSource) {
+        this.data.formatedValue = this.format(this.data.value);
+      }
       this.update();
     }
   }, {

diff --git a/src/core/index.js b/src/core/index.js
@@ -170,7 +170,7 @@ export default class LiteEditor extends aTemplate {
 
     if (selector.value) {
       let value = selector.value;
-      if (this.data.sourceFirst) {
+      if (!this.data.sourceFirst) {
         value = this.makeEditableHtml(value);
       }
       if (this.data.escapeNotRegisteredTags) {
@@ -484,8 +484,8 @@ export default class LiteEditor extends aTemplate {
     data.canRedo = this.canRedo();
     if (data.firstValue) {
       data.formatedValue = this.data.firstValue;
-      data.firstValue = '';
-    } else {
+      data.firstValue = null;
+    } else if (!data.showSource) {
       data.formatedValue = this.format(data.value);
     }
     if (data.value) {
@@ -747,6 +747,9 @@ export default class LiteEditor extends aTemplate {
   toggleSource() {
     const source = this.data.showSource;
     this.data.showSource = !source;
+    if (this.data.showSource) {
+      this.data.formatedValue = this.format(this.data.value);
+    }
     this.update();
   }