GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Remove util.min.js (minifying is EVIL)

This commit is contained in:
GNU Social instance 2014-02-24 00:31:37 +01:00
parent 28081e9115
commit 398491b39b
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/Makefile
View File

@ -1,16 +1,12 @@
.fake: all clean
TARGETS=util.min.js extlib/json2.min.js extlib/jquery.cookie.min.js
UTIL_SOURCES=util.js xbImportNode.js geometa.js
all: $(TARGETS)
clean:
rm -f $(TARGETS)
util.min.js: $(UTIL_SOURCES)
cat $+ | yui-compressor --type js > $@
extlib/json2.min.js: extlib/json2.js
yui-compressor $+ > $@

1
js/util.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
lib/action.php
View File

@ -389,13 +389,10 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowJQueryScripts', array($this));
}
if (Event::handle('StartShowStatusNetScripts', array($this))) {
if (common_config('site', 'minify')) {
$this->script('util.min.js');
} else {
$this->script('util.js');
$this->script('xbImportNode.js');
$this->script('geometa.js');
}
$this->script('util.js');
$this->script('xbImportNode.js');
$this->script('geometa.js');
// This route isn't available in single-user mode.
// Not sure why, but it causes errors here.
$this->inlineScript('var _peopletagAC = "' .