Merge branch 'g5'

2014-07-28 11:12:30 +09:00
parent 5ef55082ac 3c104111a0
commit bdbf77b565
2 changed files with 5 additions and 3 deletions
--- a/plugin/editor/smarteditor2/js/smarteditor2.js
+++ b/plugin/editor/smarteditor2/js/smarteditor2.js
@ -6851,8 +6851,10 @@ nhn.husky.SE_EditingArea_WYSIWYG = jindo.$Class({
 		// --[SMARTEDITORSUS-875]
 		
 		var sContent, 
-			oNavigator = this.oApp.oNavigator, 
-			bUnderIE11 = oNavigator.ie && document.documentMode < 11, // IE11미만
+			oNavigator = this.oApp.oNavigator,
+            tmp_htBrowser = jindo.$Agent().navigator(),
+			//bUnderIE11 = oNavigator.ie && document.documentMode < 11, // IE11미만
+            bUnderIE11 = oNavigator.ie && tmp_htBrowser.nativeVersion < 11, // IE11미만
 			sCursorHolder = bUnderIE11 ? "" : "<br>";

 		if(this.oApp.applyConverter){
--- a/plugin/editor/smarteditor2/js/smarteditor2.min.js
+++ b/plugin/editor/smarteditor2/js/smarteditor2.min.js