tracer/x-editable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove $.browser from wysihtml5

Browse Source
This commit is contained in:
vitalets
2013-03-06 20:09:46 +04:00
parent 8fd0987f12
commit f28819e4c5
2 changed files with 9 additions and 4 deletions
CHANGELOG.txt
src/inputs-ext/wysihtml5
wysihtml5.js

3
CHANGELOG.txt

@ -5,6 +5,9 @@ X-editable changelog
Version 1.4.2 wip Version 1.4.2 wip
---------------------------- ----------------------------
[bug] remove $.browser from wysihtml5 input to support jQuery 1.9 (vitalets)
[bug #142] editable poshytip jquery 1.9+ compatibility (spiderpug)
[enh #126] Update bootstrap datepicker library and add minViewMode to options (kev360)
[enh #150] select2 with showbuttons = false (vitalets) [enh #150] select2 with showbuttons = false (vitalets)
[bug #149] datepicker not shown when showbuttons = false (vitalets) [bug #149] datepicker not shown when showbuttons = false (vitalets)
[bug #133] clear button incorect position due to parent line-height property (vitalets) [bug #133] clear button incorect position due to parent line-height property (vitalets)

10
src/inputs-ext/wysihtml5/wysihtml5.js

@ -35,8 +35,9 @@ $(function(){
$.extend(Wysihtml5.prototype, { $.extend(Wysihtml5.prototype, {
render: function () { render: function () {
var deferred = $.Deferred(); var deferred = $.Deferred(),
msieOld;
//generate unique id as it required for wysihtml5 //generate unique id as it required for wysihtml5
this.$input.attr('id', 'textarea_'+(new Date()).getTime()); this.$input.attr('id', 'textarea_'+(new Date()).getTime());
@ -56,9 +57,10 @@ $(function(){
/* /*
In IE8 wysihtml5 iframe stays on the same line with buttons toolbar (inside popover). In IE8 wysihtml5 iframe stays on the same line with buttons toolbar (inside popover).
Not pretty but working solution is to add <br>. If you fine better way, please send PR. The only solution I found is to add <br>. If you fine better way, please send PR.
*/ */
if($.browser.msie && parseInt($.browser.version, 10) <= 8) { msieOld = /msie\s*(8|7|6)/.test(navigator.userAgent.toLowerCase());
if(msieOld) {
this.$input.before('<br><br>'); this.$input.before('<br><br>');
} }