diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b27eb1f..7ff7179 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,9 @@ X-editable changelog 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) [bug #149] datepicker not shown when showbuttons = false (vitalets) [bug #133] clear button incorect position due to parent line-height property (vitalets) diff --git a/src/inputs-ext/wysihtml5/wysihtml5.js b/src/inputs-ext/wysihtml5/wysihtml5.js index 7e1a64e..7e6316f 100644 --- a/src/inputs-ext/wysihtml5/wysihtml5.js +++ b/src/inputs-ext/wysihtml5/wysihtml5.js @@ -35,8 +35,9 @@ $(function(){ $.extend(Wysihtml5.prototype, { render: function () { - var deferred = $.Deferred(); - + var deferred = $.Deferred(), + msieOld; + //generate unique id as it required for wysihtml5 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). - 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>'); }