eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jquery infieldlabel.js removed from script list

This commit is contained in:
Mikael Nordfeldth 2015-03-07 12:32:24 +01:00
parent bc1d667784
commit be15ab47dc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/util.js
View File

@ -591,12 +591,16 @@ var SN = { // StatusNet
e.preventDefault(); e.preventDefault();
var noticeEl = $(this).closest('.notice'); var noticeEl = $(this).closest('.notice');
$.get($(this).attr('href'), {ajax: 1}, function (data, textStatus, xhr) { $.get($(this).attr('href'), {ajax: 1}, function (data, textStatus, xhr) {
noticeEl.replaceWith($('body', data).html()); SN.U.NoticeOptionPopup($('body', data).html());
}); });
return false; return false;
}); });
}, },
NoticeOptionPopup: function (html) {
dialog = $(html).dialog();
},
/** /**
* Setup function -- DOES NOT trigger actions immediately. * 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. * Setup function -- DOES NOT trigger actions immediately.
* *

1
lib/action.php
View File

@ -418,7 +418,6 @@ class Action extends HTMLOutputter // lawsuit
$this->script('extlib/jquery-ui/jquery-ui.js'); $this->script('extlib/jquery-ui/jquery-ui.js');
$this->script('extlib/jquery.cookie.js'); $this->script('extlib/jquery.cookie.js');
$this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/extlib/json2.js', GNUsocial::isHTTPS()).'"); }'); $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)); Event::handle('EndShowJQueryScripts', array($this));
} }