jquery infieldlabel.js removed from script list

diff --git a/js/util.js b/js/util.js
index 7eee7c863d2cbb6db220dda2d0dca58acbdc0b45..85f917b09aeb67f107f20814c0f71166c2396342 100644 (file)
--- 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 f4bbb85f82feac7cc78b2d9d05c10ea53af34c13..14d0fe80579f70eab7915ce7ff31635b93736d66 100644 (file)
--- 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));
             }