From 6d4dcfa217172af286a69da017a82149dd7e2099 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 8 Apr 2014 12:42:35 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (70932872ba) New changes: 7093287 Don't assume selection is of an item, sometimes it's null Change-Id: I908a8e723060a6e9155532d944e3d098e1468a2f --- resources/lib/oojs-ui/oojs-ui.js | 12 +++++++++--- resources/lib/oojs-ui/oojs-ui.svg.css | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index cf838b9364..780773428b 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (4975b8db90) + * OOjs UI v0.1.0-pre (70932872ba) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: Mon Apr 07 2014 15:17:10 GMT-0700 (PDT) + * Date: Tue Apr 08 2014 12:42:30 GMT-0700 (PDT) */ ( function ( OO ) { @@ -6848,7 +6848,13 @@ OO.ui.InlineMenuWidget.prototype.getMenu = function () { * @param {OO.ui.MenuItemWidget} item Selected menu item */ OO.ui.InlineMenuWidget.prototype.onMenuSelect = function ( item ) { - var selectedLabel = item.getLabel(); + var selectedLabel; + + if ( !item ) { + return; + } + + selectedLabel = item.getLabel(); // If the label is a DOM element, clone it, because setLabel will append() it if ( selectedLabel instanceof jQuery ) { diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 873fd19f6f..bd5f527784 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (4975b8db90) + * OOjs UI v0.1.0-pre (70932872ba) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: Mon Apr 07 2014 15:17:10 GMT-0700 (PDT) + * Date: Tue Apr 08 2014 12:42:30 GMT-0700 (PDT) */ /* Textures */ -- 2.20.1