Merge branch 'master' of https://github.com/zixaphir/appchan-x
This commit is contained in:
commit
02888aac1a
3
.gitattributes
vendored
3
.gitattributes
vendored
@ -1,6 +1,9 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
# Auto detect text files and perform LF normalization
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
|
builds/* -text
|
||||||
|
text eol=lf
|
||||||
|
|
||||||
# Custom for Visual Studio
|
# Custom for Visual Studio
|
||||||
*.cs diff=csharp
|
*.cs diff=csharp
|
||||||
*.sln merge=union
|
*.sln merge=union
|
||||||
|
|||||||
@ -2,10 +2,10 @@ module.exports = (grunt) ->
|
|||||||
grunt.util.linefeed = '\n'
|
grunt.util.linefeed = '\n'
|
||||||
|
|
||||||
importCSS = (filename) ->
|
importCSS = (filename) ->
|
||||||
"\"\"\"#{grunt.file.read("src/General/css/#{filename}.css").replace(/\s+/g, ' ').trim()}\"\"\""
|
"\"\"\"#{grunt.file.read("src/General/css/#{filename}.css").replace(/\s+/g, ' ').replace(/\r/g, '').trim()}\"\"\""
|
||||||
|
|
||||||
importHTML = (filename) ->
|
importHTML = (filename) ->
|
||||||
"(innerHTML: #{JSON.stringify(grunt.file.read("src/General/html/#{filename}.html").replace(/^\s+|\s+$</gm, '').replace(/\n/g, '')).replace(/\\\\u/g, '\\u')})"
|
"(innerHTML: #{JSON.stringify(grunt.file.read("src/General/html/#{filename}.html").replace(/^ +| +$</gm, '').replace(/\r?\n/g, '')).replace(/\\\\u/g, '\\u')})"
|
||||||
|
|
||||||
html = (template) ->
|
html = (template) ->
|
||||||
parts = template.split /([\$&@]){([^}`]*)}/
|
parts = template.split /([\$&@]){([^}`]*)}/
|
||||||
|
|||||||
@ -4475,18 +4475,16 @@
|
|||||||
return $.asap((function() {
|
return $.asap((function() {
|
||||||
return footer = $.id('boardNavDesktopFoot');
|
return footer = $.id('boardNavDesktopFoot');
|
||||||
}), function() {
|
}), function() {
|
||||||
var a, _i, _len, _ref, _results;
|
var a, _i, _len, _ref;
|
||||||
if (a = $("a[href*='/" + g.BOARD + "/']", footer)) {
|
if (a = $("a[href*='/" + g.BOARD + "/']", footer)) {
|
||||||
a.className = 'current';
|
a.className = 'current';
|
||||||
}
|
}
|
||||||
if (Conf['JSON Navigation']) {
|
if (Conf['JSON Navigation']) {
|
||||||
_ref = $$('a', footer);
|
_ref = $$('a', footer);
|
||||||
_results = [];
|
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
a = _ref[_i];
|
a = _ref[_i];
|
||||||
_results.push($.on(a, 'click', Navigate.navigate));
|
$.on(a, 'click', Navigate.navigate);
|
||||||
}
|
}
|
||||||
return _results;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -7414,19 +7412,17 @@
|
|||||||
},
|
},
|
||||||
archive: function() {
|
archive: function() {
|
||||||
return $.ready(function() {
|
return $.ready(function() {
|
||||||
var name, trip, _i, _j, _len, _len1, _ref, _ref1, _results;
|
var name, trip, _i, _j, _len, _len1, _ref, _ref1;
|
||||||
_ref = $$('.name');
|
_ref = $$('.name');
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
name = _ref[_i];
|
name = _ref[_i];
|
||||||
name.textContent = 'Anonymous';
|
name.textContent = 'Anonymous';
|
||||||
}
|
}
|
||||||
_ref1 = $$('.postertrip');
|
_ref1 = $$('.postertrip');
|
||||||
_results = [];
|
|
||||||
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
|
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
|
||||||
trip = _ref1[_j];
|
trip = _ref1[_j];
|
||||||
_results.push($.rm(trip));
|
$.rm(trip);
|
||||||
}
|
}
|
||||||
return _results;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -15231,12 +15227,9 @@
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
updatePosition: function() {
|
updatePosition: function() {
|
||||||
var _results;
|
|
||||||
_results = [];
|
|
||||||
while (Unread.position && !Unread.posts.has(Unread.position.ID)) {
|
while (Unread.position && !Unread.posts.has(Unread.position.ID)) {
|
||||||
_results.push(Unread.position = Unread.position.next);
|
Unread.position = Unread.position.next;
|
||||||
}
|
}
|
||||||
return _results;
|
|
||||||
},
|
},
|
||||||
saveLastReadPost: $.debounce(2 * $.SECOND, function() {
|
saveLastReadPost: $.debounce(2 * $.SECOND, function() {
|
||||||
var ID, i, postIDs, _i, _ref, _ref1;
|
var ID, i, postIDs, _i, _ref, _ref1;
|
||||||
|
|||||||
@ -4500,18 +4500,16 @@
|
|||||||
return $.asap((function() {
|
return $.asap((function() {
|
||||||
return footer = $.id('boardNavDesktopFoot');
|
return footer = $.id('boardNavDesktopFoot');
|
||||||
}), function() {
|
}), function() {
|
||||||
var a, _i, _len, _ref, _results;
|
var a, _i, _len, _ref;
|
||||||
if (a = $("a[href*='/" + g.BOARD + "/']", footer)) {
|
if (a = $("a[href*='/" + g.BOARD + "/']", footer)) {
|
||||||
a.className = 'current';
|
a.className = 'current';
|
||||||
}
|
}
|
||||||
if (Conf['JSON Navigation']) {
|
if (Conf['JSON Navigation']) {
|
||||||
_ref = $$('a', footer);
|
_ref = $$('a', footer);
|
||||||
_results = [];
|
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
a = _ref[_i];
|
a = _ref[_i];
|
||||||
_results.push($.on(a, 'click', Navigate.navigate));
|
$.on(a, 'click', Navigate.navigate);
|
||||||
}
|
}
|
||||||
return _results;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -7455,19 +7453,17 @@
|
|||||||
},
|
},
|
||||||
archive: function() {
|
archive: function() {
|
||||||
return $.ready(function() {
|
return $.ready(function() {
|
||||||
var name, trip, _i, _j, _len, _len1, _ref, _ref1, _results;
|
var name, trip, _i, _j, _len, _len1, _ref, _ref1;
|
||||||
_ref = $$('.name');
|
_ref = $$('.name');
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
name = _ref[_i];
|
name = _ref[_i];
|
||||||
name.textContent = 'Anonymous';
|
name.textContent = 'Anonymous';
|
||||||
}
|
}
|
||||||
_ref1 = $$('.postertrip');
|
_ref1 = $$('.postertrip');
|
||||||
_results = [];
|
|
||||||
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
|
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
|
||||||
trip = _ref1[_j];
|
trip = _ref1[_j];
|
||||||
_results.push($.rm(trip));
|
$.rm(trip);
|
||||||
}
|
}
|
||||||
return _results;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -15254,12 +15250,9 @@
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
updatePosition: function() {
|
updatePosition: function() {
|
||||||
var _results;
|
|
||||||
_results = [];
|
|
||||||
while (Unread.position && !Unread.posts.has(Unread.position.ID)) {
|
while (Unread.position && !Unread.posts.has(Unread.position.ID)) {
|
||||||
_results.push(Unread.position = Unread.position.next);
|
Unread.position = Unread.position.next;
|
||||||
}
|
}
|
||||||
return _results;
|
|
||||||
},
|
},
|
||||||
saveLastReadPost: $.debounce(2 * $.SECOND, function() {
|
saveLastReadPost: $.debounce(2 * $.SECOND, function() {
|
||||||
var ID, i, postIDs, _i, _ref, _ref1;
|
var ID, i, postIDs, _i, _ref, _ref1;
|
||||||
|
|||||||
@ -23,3 +23,4 @@ Anonymize =
|
|||||||
$.ready ->
|
$.ready ->
|
||||||
name.textContent = 'Anonymous' for name in $$ '.name'
|
name.textContent = 'Anonymous' for name in $$ '.name'
|
||||||
$.rm trip for trip in $$ '.postertrip'
|
$.rm trip for trip in $$ '.postertrip'
|
||||||
|
return
|
||||||
|
|||||||
@ -82,6 +82,7 @@ Header =
|
|||||||
a.className = 'current'
|
a.className = 'current'
|
||||||
if Conf['JSON Navigation']
|
if Conf['JSON Navigation']
|
||||||
$.on a, 'click', Navigate.navigate for a in $$ 'a', footer
|
$.on a, 'click', Navigate.navigate for a in $$ 'a', footer
|
||||||
|
return
|
||||||
|
|
||||||
bar: $.el 'div',
|
bar: $.el 'div',
|
||||||
id: 'header-bar'
|
id: 'header-bar'
|
||||||
|
|||||||
@ -208,6 +208,7 @@ Unread =
|
|||||||
updatePosition: ->
|
updatePosition: ->
|
||||||
while Unread.position and !Unread.posts.has Unread.position.ID
|
while Unread.position and !Unread.posts.has Unread.position.ID
|
||||||
Unread.position = Unread.position.next
|
Unread.position = Unread.position.next
|
||||||
|
return
|
||||||
|
|
||||||
saveLastReadPost: $.debounce 2 * $.SECOND, ->
|
saveLastReadPost: $.debounce 2 * $.SECOND, ->
|
||||||
postIDs = Unread.thread.posts.keys
|
postIDs = Unread.thread.posts.keys
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user