Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

# Conflicts:
#	dist/bundle.min.js
es6
windy 7 years ago
parent
b9b7cccc42 f524f19066
commit
f30eb1480d
6 changed files with 46 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/_fineui.min.js
  2. 8
      dist/bundle.js
  3. 8
      dist/case.js
  4. 8
      dist/fineui.js
  5. 2
      dist/fineui.min.js
  6. 8
      src/case/richeditor/niceditor/niceditor.js

2
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/bundle.js vendored
Unescape View File

@ -83513,10 +83513,11 @@ 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) {
} catch(e) {
if (range.insertNode) {
// IE
range.deleteContents();
range.insertNode($(html)[0]);
@ -83524,6 +83525,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10
range.pasteHTML(html);
}
}
},
nicCommand: function (cmd, args) {

8
dist/case.js vendored
Unescape View File

@ -11014,10 +11014,11 @@ 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) {
} catch(e) {
if (range.insertNode) {
// IE
range.deleteContents();
range.insertNode($(html)[0]);
@ -11025,6 +11026,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10
range.pasteHTML(html);
}
}
},
nicCommand: function (cmd, args) {

8
dist/fineui.js vendored
Unescape View File

@ -83756,10 +83756,11 @@ 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) {
} catch(e) {
if (range.insertNode) {
// IE
range.deleteContents();
range.insertNode($(html)[0]);
@ -83767,6 +83768,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10
range.pasteHTML(html);
}
}
},
nicCommand: function (cmd, args) {

2
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/case/richeditor/niceditor/niceditor.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save