Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 16:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

.jsbeautify

Browse Source
This commit is contained in:
psychobunny
2013-09-17 13:03:53 -04:00
parent cf889cfe25
commit 828d937dec
2 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.jsbeautifyrc Normal file
View File

@@ -0,0 +1,17 @@
{
"indent_size": 4,
"indent_char": " ",
"indent_level": 0,
"indent_with_tabs": false,
"preserve_newlines": true,
"max_preserve_newlines": 10,
"jslint_happy": false,
"brace_style": "collapse",
"keep_array_indentation": false,
"keep_function_indentation": false,
"space_before_conditional": true,
"break_chained_methods": false,
"eval_code": false,
"unescape_strings": false,
"wrap_line_length": 0
}

73
public/src/app.js
View File

@@ -30,9 +30,9 @@ var socket,
app.alert(data); app.alert(data);
}); });
socket.on('connect', function(data){ socket.on('connect', function(data) {
if(reconnecting) { if (reconnecting) {
setTimeout(function(){ setTimeout(function() {
app.alert({ app.alert({
alert_id: 'connection_alert', alert_id: 'connection_alert',
title: 'Connected', title: 'Connected',
@@ -43,18 +43,20 @@ var socket,
}, 1000); }, 1000);
reconnecting = false; reconnecting = false;
reconnectTries = 0; reconnectTries = 0;
socket.emit('api:updateHeader', { fields: ['username', 'picture', 'userslug'] }); socket.emit('api:updateHeader', {
fields: ['username', 'picture', 'userslug']
});
} }
}); });
socket.on('reconnecting', function(data) { socket.on('reconnecting', function(data) {
function showDisconnectModal() { function showDisconnectModal() {
$('#disconnect-modal').modal({ $('#disconnect-modal').modal({
backdrop:'static', backdrop: 'static',
show:true show: true
}); });
$('#reload-button').on('click',function(){ $('#reload-button').on('click', function() {
$('#disconnect-modal').modal('hide'); $('#disconnect-modal').modal('hide');
window.location.reload(); window.location.reload();
}); });
@@ -63,7 +65,7 @@ var socket,
reconnecting = true; reconnecting = true;
reconnectTries++; reconnectTries++;
if(reconnectTries > 4) { if (reconnectTries > 4) {
showDisconnectModal(); showDisconnectModal();
return; return;
} }
@@ -129,10 +131,10 @@ var socket,
// Willingly stolen from: http://phpjs.org/functions/strip_tags/ // Willingly stolen from: http://phpjs.org/functions/strip_tags/
app.strip_tags = function(input, allowed) { app.strip_tags = function(input, allowed) {
allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>) allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi; commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) { return input.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''; return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
}); });
} }
@@ -146,7 +148,7 @@ var socket,
app.alert = function(params) { app.alert = function(params) {
var alert_id = 'alert_button_' + ((params.alert_id) ? params.alert_id : new Date().getTime()); var alert_id = 'alert_button_' + ((params.alert_id) ? params.alert_id : new Date().getTime());
var alert = $('#'+alert_id); var alert = $('#' + alert_id);
function startTimeout(div, timeout) { function startTimeout(div, timeout) {
var timeoutId = setTimeout(function() { var timeoutId = setTimeout(function() {
@@ -158,15 +160,14 @@ var socket,
$(div).attr('timeoutId', timeoutId); $(div).attr('timeoutId', timeoutId);
} }
if(alert.length > 0) { if (alert.length > 0) {
alert.find('strong').html(params.title); alert.find('strong').html(params.title);
alert.find('p').html(params.message); alert.find('p').html(params.message);
alert.attr('class', "alert toaster-alert " + "alert-" + params.type); alert.attr('class', "alert toaster-alert " + "alert-" + params.type);
clearTimeout(alert.attr('timeoutId')); clearTimeout(alert.attr('timeoutId'));
startTimeout(alert, params.timeout); startTimeout(alert, params.timeout);
} } else {
else {
var div = document.createElement('div'), var div = document.createElement('div'),
button = document.createElement('button'), button = document.createElement('button'),
strong = document.createElement('strong'), strong = document.createElement('strong'),
@@ -191,7 +192,7 @@ var socket,
if (params.location == null) if (params.location == null)
params.location = 'alert_window'; params.location = 'alert_window';
jQuery('#'+params.location).prepend(jQuery(div).fadeIn('100')); jQuery('#' + params.location).prepend(jQuery(div).fadeIn('100'));
if (params.timeout) { if (params.timeout) {
startTimeout(div, params.timeout); startTimeout(div, params.timeout);
@@ -209,7 +210,7 @@ var socket,
} }
app.alertSuccess = function(message, timeout) { app.alertSuccess = function(message, timeout) {
if(!timeout) if (!timeout)
timeout = 2000; timeout = 2000;
app.alert({ app.alert({
@@ -221,7 +222,7 @@ var socket,
} }
app.alertError = function(message, timeout) { app.alertError = function(message, timeout) {
if(!timeout) if (!timeout)
timeout = 2000; timeout = 2000;
app.alert({ app.alert({
@@ -234,7 +235,7 @@ var socket,
app.current_room = null; app.current_room = null;
app.enter_room = function(room) { app.enter_room = function(room) {
if(socket) { if (socket) {
if (app.current_room === room) if (app.current_room === room)
return; return;
@@ -268,13 +269,13 @@ var socket,
var url = window.location.href, var url = window.location.href,
parts = url.split('/'), parts = url.split('/'),
active = parts[parts.length-1]; active = parts[parts.length - 1];
jQuery('#main-nav li').removeClass('active'); jQuery('#main-nav li').removeClass('active');
if(active) { if (active) {
jQuery('#main-nav li a').each(function() { jQuery('#main-nav li a').each(function() {
var href = this.getAttribute('href'); var href = this.getAttribute('href');
if(active.match(/^users/)) if (active.match(/^users/))
active = 'users'; active = 'users';
if (href && href.match(active)) { if (href && href.match(active)) {
jQuery(this.parentNode).addClass('active'); jQuery(this.parentNode).addClass('active');
@@ -298,9 +299,9 @@ var socket,
}); });
} }
if(showWelcomeMessage) { if (showWelcomeMessage) {
showWelcomeMessage = false; showWelcomeMessage = false;
if(document.readyState !== 'complete') { if (document.readyState !== 'complete') {
$(document).ready(showAlert); $(document).ready(showAlert);
} else { } else {
showAlert(); showAlert();
@@ -317,7 +318,7 @@ var socket,
app.openChat = function(username, touid) { app.openChat = function(username, touid) {
require(['chat'], function(chat) { require(['chat'], function(chat) {
var chatModal; var chatModal;
if(!chat.modalExists(touid)) { if (!chat.modalExists(touid)) {
chatModal = chat.createModal(username, touid); chatModal = chat.createModal(username, touid);
} else { } else {
chatModal = chat.getModal(touid); chatModal = chat.getModal(touid);
@@ -336,7 +337,7 @@ var socket,
.append(html) .append(html)
.fadeIn('slow'); .fadeIn('slow');
for(var x=0,numPosts=data.posts.length;x<numPosts;x++) { for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) {
socket.emit('api:post.privileges', data.posts[x].pid); socket.emit('api:post.privileges', data.posts[x].pid);
} }
@@ -350,11 +351,11 @@ var socket,
app.infiniteLoaderActive = false; app.infiniteLoaderActive = false;
app.loadMorePosts = function(tid, callback) { app.loadMorePosts = function(tid, callback) {
if(app.infiniteLoaderActive) if (app.infiniteLoaderActive)
return; return;
app.infiniteLoaderActive = true; app.infiniteLoaderActive = true;
if($('#loading-indicator').attr('done') === '0') if ($('#loading-indicator').attr('done') === '0')
$('#loading-indicator').removeClass('hide'); $('#loading-indicator').removeClass('hide');
socket.emit('api:topic.loadMore', { socket.emit('api:topic.loadMore', {
@@ -362,14 +363,14 @@ var socket,
after: document.querySelectorAll('#post-container li[data-pid]').length after: document.querySelectorAll('#post-container li[data-pid]').length
}, function(data) { }, function(data) {
app.infiniteLoaderActive = false; app.infiniteLoaderActive = false;
if(data.posts.length) { if (data.posts.length) {
$('#loading-indicator').attr('done', '0'); $('#loading-indicator').attr('done', '0');
app.createNewPosts(data); app.createNewPosts(data);
} else { } else {
$('#loading-indicator').attr('done', '1'); $('#loading-indicator').attr('done', '1');
} }
$('#loading-indicator').addClass('hide'); $('#loading-indicator').addClass('hide');
if(callback) if (callback)
callback(data.posts); callback(data.posts);
}); });
} }
@@ -388,7 +389,7 @@ var socket,
app.scrollToPost = function(pid) { app.scrollToPost = function(pid) {
if(!pid) if (!pid)
return; return;
var container = $(document.body), var container = $(document.body),
@@ -401,22 +402,22 @@ var socket,
}); });
} }
if(!scrollTo.length && tid) { if (!scrollTo.length && tid) {
var intervalID = setInterval(function() { var intervalID = setInterval(function() {
app.loadMorePosts(tid, function(posts) { app.loadMorePosts(tid, function(posts) {
scrollTo = $('#post_anchor_' + pid); scrollTo = $('#post_anchor_' + pid);
if(tid && scrollTo.length) { if (tid && scrollTo.length) {
animateScroll(); animateScroll();
} }
if(!posts.length || scrollTo.length) if (!posts.length || scrollTo.length)
clearInterval(intervalID); clearInterval(intervalID);
}); });
}, 100); }, 100);
} else if(tid) { } else if (tid) {
animateScroll(); animateScroll();
} }
@@ -425,7 +426,7 @@ var socket,
jQuery('document').ready(function() { jQuery('document').ready(function() {
$('#search-form').on('submit', function() { $('#search-form').on('submit', function() {
var input = $(this).find('input'); var input = $(this).find('input');
ajaxify.go("search/"+input.val(), null, "search"); ajaxify.go("search/" + input.val(), null, "search");
input.val(''); input.val('');
return false; return false;
}) })
@@ -436,4 +437,4 @@ var socket,
loadConfig(); loadConfig();
}()); }());