From d854092d887f5c3af5be577814dab0879973ea17 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 24 Feb 2016 11:52:25 -0500 Subject: [PATCH] jqm fixes --- dashboard-ui/scripts/site.js | 4 ++-- dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js | 4 ++-- dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.widget.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index d538ca1a2..0ef23a4fa 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -404,7 +404,7 @@ var Dashboard = { } if (options.forceShow) { - elem.slideDown(400); + elem.show(); } elem.html(options.html); @@ -427,7 +427,7 @@ var Dashboard = { setTimeout(function () { // give the DOM time to catch up if (!parentElem.html()) { - footer.slideUp(); + footer.hide(); } }, 50); diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js index 3ec34800c..add248016 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js @@ -912,7 +912,7 @@ // remove nav bindings this.window.off(currentOptions.closeEvents); // unbind click handlers added when history is disabled - this.element.undelegate(currentOptions.closeLinkSelector, currentOptions.closeLinkEvents); + this.element.off(currentOptions.closeLinkEvents, currentOptions.closeLinkSelector); this._close(immediate); }, @@ -955,7 +955,7 @@ // back link clicks so we can close the popup instead of // relying on history to do it for us self.element - .delegate(currentOptions.closeLinkSelector, currentOptions.closeLinkEvents, function (theEvent) { + .on(currentOptions.closeLinkEvents, currentOptions.closeLinkSelector, function (theEvent) { self.close(); theEvent.preventDefault(); }); diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.widget.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.widget.js index 39a9b6eae..4bacdd92c 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.widget.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.widget.js @@ -412,7 +412,7 @@ eventName = match[1] + instance.eventNamespace, selector = match[2]; if (selector) { - delegateElement.delegate(selector, eventName, handlerProxy); + delegateElement.on(eventName, selector, handlerProxy); } else { element.on(eventName, handlerProxy); } @@ -421,7 +421,7 @@ _off: function (element, eventName) { eventName = (eventName || "").split(" ").join(this.eventNamespace + " ") + this.eventNamespace; - element.unbind(eventName).undelegate(eventName); + element.off(eventName).off(eventName); }, _trigger: function (type, event, data) {