Browse Source

Merge pull request #468 in VISUAL/fineui from ~FAY/fineui:master to master

* commit 'bc119d6f25ef0b2a2c3e8094c2cb0696f1984e3c':
  update
  update
  BI-25467
  BI-24603
  update
  update
es6
fay 6 years ago
parent
commit
f524f19066
  1. 2
      dist/_fineui.min.js
  2. 8
      dist/bundle.js
  3. 38
      dist/bundle.min.js
  4. 8
      dist/case.js
  5. 8
      dist/fineui.js
  6. 2
      dist/fineui.min.js
  7. 8
      src/case/richeditor/niceditor/niceditor.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/bundle.js vendored

@ -83513,10 +83513,11 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C // w3c
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } catch(e) {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -83524,6 +83525,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {

38
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/case.js vendored

@ -11014,10 +11014,11 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C // w3c
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } catch(e) {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -11025,6 +11026,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {

8
dist/fineui.js vendored

@ -83756,10 +83756,11 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C // w3c
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } catch(e) {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -83767,6 +83768,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
src/case/richeditor/niceditor/niceditor.js

@ -307,10 +307,11 @@
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C // w3c
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } catch(e) {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -318,6 +319,7 @@
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {

Loading…
Cancel
Save