Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

# Conflicts:
#	dist/bundle.min.js
es6
windy 6 years ago
parent
commit
f30eb1480d
  1. 2
      dist/_fineui.min.js
  2. 20
      dist/bundle.js
  3. 20
      dist/case.js
  4. 20
      dist/fineui.js
  5. 2
      dist/fineui.min.js
  6. 20
      src/case/richeditor/niceditor/niceditor.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

20
dist/bundle.js vendored

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

20
dist/case.js vendored

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

20
dist/fineui.js vendored

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

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

20
src/case/richeditor/niceditor/niceditor.js

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

Loading…
Cancel
Save