diff --git a/public/css/style.less b/public/css/style.less index 5cb9d0b0ff..de3353ad14 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -733,4 +733,14 @@ body .navbar .nodebb-inline-block { font-size: 12px; color: red; } -} \ No newline at end of file +} + +#chat-content { + width:95%; + height:200px; + resize:none; +} + +#chat-message-input { + width:95%; +} diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 8bbfdc1595..0c8fc84f06 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -48,9 +48,6 @@ var ajaxify = {}; jQuery('#footer, #content').fadeOut(100); - // Close the post window if it is open - app.close_post_window(); - templates.load_template(function() { exec_body_scripts(content); @@ -62,6 +59,7 @@ var ajaxify = {}; app.process_page(); jQuery('#content, #footer').fadeIn(200); + app.close_post_window(); }, url, template); return true; diff --git a/public/src/app.js b/public/src/app.js index c5a2f58bc9..198cef6d51 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -14,6 +14,10 @@ var socket, config = data; socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : ''); + var reconnecting = false; + var reconnectTries = 0; + + socket.on('event:connect', function(data) { console.log('connected to nodebb socket: ', data); }); @@ -32,15 +36,56 @@ var socket, contentEl.value = data.post; }); - socket.on('disconnect', function(data){ - setTimeout(function() { - $('#disconnect-modal').modal('show'); - $('#reload-button').on('click',function(){ - $('#disconnect-modal').modal('hide'); - window.location.reload(); + socket.on('connect', function(data){ + if(reconnecting) { + app.alert({ + alert_id: 'connection_alert', + title: 'Connected', + message: 'Connection successfull', + type: 'success', + timeout: 5000 }); - }, 500); + reconnecting = false; + } }); + + socket.on('disconnect', function(data){ + app.alert({ + alert_id: 'connection_alert', + title: 'Disconnect', + message: 'You have disconnected from NodeBB, we will try to reconnect!', + type: 'error', + timeout: 5000 + }); + }); + + socket.on('reconnecting', function(data) { + reconnecting = true; + reconnectTries++; + if(reconnectTries > 4) { + showDisconnectModal(); + return; + } + app.alert({ + alert_id: 'connection_alert', + title: 'Reconnecting', + message: 'You have disconnected from NodeBB, we will try to reconnect you.
', + type: 'notify', + timeout: 5000 + }); + }); + + function showDisconnectModal() { + $('#disconnect-modal').modal({ + backdrop:'static', + show:true + }); + + $('#reload-button').on('click',function(){ + $('#disconnect-modal').modal('hide'); + window.location.reload(); + }); + } }, async: false }); @@ -50,6 +95,17 @@ var socket, return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"); } + // Willingly stolen from: http://phpjs.org/functions/strip_tags/ + 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 () + var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, + commentsAndPhpTags = /|<\?(?:php)?[\s\S]*?\?>/gi; + + return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) { + return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''; + }); + } + // use unique alert_id to have multiple alerts visible at a time, use the same alert_id to fade out the current instance // type : error, success, info, warning/notify // title = bolded title text @@ -57,51 +113,60 @@ var socket, // timeout default = permanent // location : notification_window (default) or content app.alert = function(params) { - var div = document.createElement('div'), - button = document.createElement('button'), - strong = document.createElement('strong'), - p = document.createElement('p'); + var alert_id = 'alert_button_' + ((params.alert_id) ? params.alert_id : new Date().getTime()); - jQuery('#'+alert_id).fadeOut(500, function() { - this.remove(); - }); + var alert = $('#'+alert_id); - p.innerHTML = params.message; - strong.innerHTML = params.title; - - div.className = "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type); - - div.setAttribute('id', alert_id); - div.appendChild(button); - div.appendChild(strong); - div.appendChild(p); - - button.className = 'close'; - button.innerHTML = '×'; - button.onclick = function(ev) { - div.parentNode.removeChild(div); + if(alert.length > 0) { + alert.find('strong').html(params.title); + alert.find('p').html(params.message); + alert.attr('class', "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type)); } + else { - if (params.location == null) params.location = 'notification_window'; + var div = document.createElement('div'), + button = document.createElement('button'), + strong = document.createElement('strong'), + p = document.createElement('p'); - jQuery('#'+params.location).prepend(jQuery(div).fadeIn('100')); + p.innerHTML = params.message; + strong.innerHTML = params.title; - if (params.timeout) { - setTimeout(function() { - jQuery(div).fadeOut(1000, function() { - this.remove(); - }); - }, params.timeout) - } + div.className = "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type); + + div.setAttribute('id', alert_id); + div.appendChild(button); + div.appendChild(strong); + div.appendChild(p); - if (params.clickfn) { - div.onclick = function() { - params.clickfn(); - jQuery(div).fadeOut(500, function() { - this.remove(); - }); + button.className = 'close'; + button.innerHTML = '×'; + button.onclick = function(ev) { + div.parentNode.removeChild(div); + } + + if (params.location == null) + params.location = 'notification_window'; + + jQuery('#'+params.location).prepend(jQuery(div).fadeIn('100')); + + if (params.timeout) { + setTimeout(function() { + jQuery(div).fadeOut(1000, function() { + this.remove(); + }); + }, params.timeout) + } + + if (params.clickfn) { + div.onclick = function() { + params.clickfn(); + jQuery(div).fadeOut(500, function() { + this.remove(); + }); + } } } } @@ -114,6 +179,7 @@ var socket, app.open_post_window = function(post_mode, id, title, pid) { + submit_post_btn = submit_post_btn || document.getElementById('submit_post_btn'); post_title = post_title || document.getElementById('post_title'); reply_title = reply_title || document.getElementById('reply_title'); diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl index 4d8df6ca3e..3f181571be 100644 --- a/public/templates/admin/users.tpl +++ b/public/templates/admin/users.tpl @@ -16,7 +16,7 @@
- +
{users.username} diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index 75d4086dce..c21eb5599f 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -81,7 +81,6 @@ } }); - // Post window events var postWindowEl = document.getElementById('post_window'), discardEl = document.getElementById('discard-post'); diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 57c77e730e..ffa9726e56 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -9,6 +9,7 @@ + @@ -85,13 +86,25 @@

Socket Disconnect

- Looks like you disconnected, try reloading the page. + Looks like you disconnected, try reloading the page.
Reload
+ +
\ No newline at end of file diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index cef7b2a962..c2611a59ee 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -25,12 +25,12 @@

{topic_name}

- - - + + + - - + +

@@ -52,7 +52,7 @@ -
  • +
  • @@ -66,6 +66,7 @@
    {posts.signature}
    +
    @@ -82,9 +83,9 @@
    - +