yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing InsertMacroSplitButton typo in jquery selector causing javascript errors.

Browse Source 
fixing modal $.browser checks to not cause console errors due to deprecated browser object in jquery 1.9+.
This commit is contained in:
Claus
2016-08-08 13:23:46 +02:00
parent 1b9a3e8ebc
commit 55752abdcf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI/umbraco_client/modal/jquery.simplemodal.1.4.1.custom.js
View File

@@ -1,7 +1,7 @@
; (function ($) {
var ie6 = $.browser.msie && parseInt($.browser.version) === 6 && typeof window['XMLHttpRequest'] !== 'object',
ie7 = $.browser.msie && parseInt($.browser.version) === 7,
var ie6 = $.browser && $.browser.msie && parseInt($.browser.version) === 6 && typeof window['XMLHttpRequest'] !== 'object',
ie7 = $.browser && $.browser.msie && parseInt($.browser.version) === 7,
ieQuirks = null,
w = [];
@@ -418,8 +418,8 @@
var el = $(window);
// fix a jQuery/Opera bug with determining the window height
var h = $.browser.opera && $.browser.version > '9.5' && $.fn.jquery < '1.3'
|| $.browser.opera && $.browser.version < '9.5' && $.fn.jquery > '1.2.6'
var h = $.browser && $.browser.opera && $.browser.version > '9.5' && $.fn.jquery < '1.3'
|| $.browser && $.browser.opera && $.browser.version < '9.5' && $.fn.jquery > '1.2.6'
? el[0].innerHeight : el.height();
return [h, el.width()];

2
src/Umbraco.Web.UI/umbraco_client/modal/modal.js
View File

@@ -386,7 +386,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
},
params: {}
};
var s = 0, H = $.jqm.hash, A = [], ie6 = $.browser.msie && ($.browser.version == "6.0"), F = false,
var s = 0, H = $.jqm.hash, A = [], ie6 = $.browser && $.browser.msie && ($.browser.version == "6.0"), F = false,
i = $('<iframe src="javascript:false;document.write(\'\');" class="jqm"></iframe>').css({ opacity: 0 }),
e = function(h) { if (ie6) if (h.o) h.o.html('<p style="width:100%;height:100%"/>').prepend(i); else if (!$('iframe.jqm', h.w)[0]) h.w.prepend(i); },
//f = function(h) { try { $(':input:visible', h.w)[0].focus(); } catch (_) { } },

2
src/Umbraco.Web.UI/umbraco_client/splitbutton/InsertMacroSplitButton.js
View File

@@ -27,7 +27,7 @@
//be the previous element with the class .sbMenu
var splitButtons = $('.sbPlaceHolder', container);
splitButtons.each(function() {
var menu = $(this).prev(".sbMenu;");
var menu = $(this).prev(".sbMenu");
$(this).find("a.sbLink").splitbutton({ menu: menu });
});