From be15ab47dca8b65acd8a313692ad607f0aeb34aa Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 7 Mar 2015 12:32:24 +0100 Subject: [PATCH] jquery infieldlabel.js removed from script list --- js/util.js | 14 +++++++++++++- lib/action.php | 1 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/js/util.js b/js/util.js index 7eee7c863d..85f917b09a 100644 --- a/js/util.js +++ b/js/util.js @@ -591,12 +591,16 @@ var SN = { // StatusNet e.preventDefault(); var noticeEl = $(this).closest('.notice'); $.get($(this).attr('href'), {ajax: 1}, function (data, textStatus, xhr) { - noticeEl.replaceWith($('body', data).html()); + SN.U.NoticeOptionPopup($('body', data).html()); }); return false; }); }, + NoticeOptionPopup: function (html) { + dialog = $(html).dialog(); + }, + /** * Setup function -- DOES NOT trigger actions immediately. * @@ -795,6 +799,14 @@ var SN = { // StatusNet }); }, + NoticeOptionPopup: function (html) { + dialog = $(html).dialog({ + resizable: false, + height: 150, + modal: true, + }); + }, + /** * Setup function -- DOES NOT trigger actions immediately. * diff --git a/lib/action.php b/lib/action.php index f4bbb85f82..14d0fe8057 100644 --- a/lib/action.php +++ b/lib/action.php @@ -418,7 +418,6 @@ class Action extends HTMLOutputter // lawsuit $this->script('extlib/jquery-ui/jquery-ui.js'); $this->script('extlib/jquery.cookie.js'); $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/extlib/json2.js', GNUsocial::isHTTPS()).'"); }'); - $this->script('extlib/jquery.infieldlabel.js'); Event::handle('EndShowJQueryScripts', array($this)); }