Commit 17638166 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1542153: Updating jQuery to 2.2.0



Keeping jQuery up to date and also removing the IE8 dependency

behatnotneeded

Change-Id: I427125e2ac798451d02a70d7cf590170cd0ef512
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent ac434eff
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -2,14 +2,8 @@ jQuery in Mahara
=================

Website: http://jquery.com/
Version: 2.1.1
Version: 2.2.0

Changes:

* None
 No newline at end of file

Notes:

* the deprecated_jquery.js is used to do the $.browser() function used
for detecting IE 8 - once the support for IE8 stops then that file can
be deleted.
+0 −41
Original line number Diff line number Diff line
// Dealing with removed $.browser() from jQuery 2 - needed to deal with
// mahara jquery code related to IE8 and below. Once we don't have to
// support IE8 this file can be deleted and the call to it in
// htdocs/lib/web.php can be removed.

jQuery.uaMatch = function( ua ) {
    ua = ua.toLowerCase();

    var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
                /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
                /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
                /(msie) ([\w.]+)/.exec( ua ) ||
                ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(
                ua ) ||
                [];

    return {
        browser: match[ 1 ] || "",
        version: match[ 2 ] || "0"
    };
};

// Don't clobber any existing jQuery.browser in case it's different
if ( !jQuery.browser ) {
    matched = jQuery.uaMatch( navigator.userAgent );
    browser = {};

    if ( matched.browser ) {
        browser[ matched.browser ] = true;
        browser.version = matched.version;
    }

    // Chrome is Webkit, but Webkit is also Safari.
    if ( browser.chrome ) {
        browser.webkit = true;
    } else if ( browser.webkit ) {
        browser.safari = true;
    }

    jQuery.browser = browser;
}
 No newline at end of file
+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ This javascript library is required for the flexible page layout feature develop

Website: http://jqueryui.com/
Version: 1.11.4
Dependency package: jquery 2.1.1

Changes:

+4 −4

File changed.

Preview size limit exceeded, changes collapsed.