firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2014-07-28 11:12:30 +09:00
parent 5ef55082ac 3c104111a0
commit bdbf77b565
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/editor/smarteditor2/js/smarteditor2.js
View File

@ -6851,8 +6851,10 @@ nhn.husky.SE_EditingArea_WYSIWYG = jindo.$Class({
// --[SMARTEDITORSUS-875] // --[SMARTEDITORSUS-875]
var sContent, var sContent,
oNavigator = this.oApp.oNavigator, oNavigator = this.oApp.oNavigator,
bUnderIE11 = oNavigator.ie && document.documentMode < 11, // IE11미만 tmp_htBrowser = jindo.$Agent().navigator(),
//bUnderIE11 = oNavigator.ie && document.documentMode < 11, // IE11미만
bUnderIE11 = oNavigator.ie && tmp_htBrowser.nativeVersion < 11, // IE11미만
sCursorHolder = bUnderIE11 ? "" : "<br>"; sCursorHolder = bUnderIE11 ? "" : "<br>";
if(this.oApp.applyConverter){ if(this.oApp.applyConverter){

2
plugin/editor/smarteditor2/js/smarteditor2.min.js vendored
View File

File diff suppressed because one or more lines are too long