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

fixed issue where outgoing links warning page would intercept clicks to the search button in the headerbar (thanks @dove)

Browse Source 
- linted some files
This commit is contained in:
Julian Lam
2014-01-14 10:31:21 -05:00
parent 3837841882
commit 0ea09972b4
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
public/src/app.js
View File

@@ -420,7 +420,9 @@ var socket,
titles: [] titles: []
}; };
app.alternatingTitle = function (title) { app.alternatingTitle = function (title) {
if (typeof title !== 'string') return; if (typeof title !== 'string') {
return;
}
if (title.length > 0) { if (title.length > 0) {
titleObj.titles[1] = title; titleObj.titles[1] = title;
@@ -434,7 +436,9 @@ var socket,
if (titleObj.interval) { if (titleObj.interval) {
clearInterval(titleObj.interval); clearInterval(titleObj.interval);
} }
if (titleObj.titles[0]) window.document.title = titleObj.titles[0]; if (titleObj.titles[0]) {
window.document.title = titleObj.titles[0];
}
} }
}; };
@@ -452,7 +456,8 @@ var socket,
}; };
app.updateHeader = function(data) { app.updateHeader = function(data) {
$('#search-button').on('click', function() { $('#search-button').off().on('click', function(e) {
e.stopPropagation();
$('#search-fields').removeClass('hide').show(); $('#search-fields').removeClass('hide').show();
$(this).hide(); $(this).hide();
$('#search-fields input').focus(); $('#search-fields input').focus();
@@ -484,12 +489,15 @@ var socket,
var userLabel = loggedInMenu.find('#user_label'); var userLabel = loggedInMenu.find('#user_label');
if (userLabel.length) { if (userLabel.length) {
if (data['userslug']) if (data.userslug) {
userLabel.find('#user-profile-link').attr('href', RELATIVE_PATH + '/user/' + data['userslug']); userLabel.find('#user-profile-link').attr('href', RELATIVE_PATH + '/user/' + data.userslug);
if (data['picture']) }
userLabel.find('img').attr('src', data['picture']); if (data.picture) {
if (data['username']) userLabel.find('img').attr('src', data.picture);
userLabel.find('span').html(data['username']); }
if (data.username) {
userLabel.find('span').html(data.username);
}
$('#logout-link').on('click', app.logout); $('#logout-link').on('click', app.logout);
} }
@@ -511,8 +519,9 @@ var socket,
} }
$('#main-nav a,#user-control-list a,#logged-out-menu li a').off('click').on('click', function() { $('#main-nav a,#user-control-list a,#logged-out-menu li a').off('click').on('click', function() {
if($('.navbar .navbar-collapse').hasClass('in')) if($('.navbar .navbar-collapse').hasClass('in')) {
$('.navbar-header button').click(); $('.navbar-header button').click();
}
}); });
}; };

3
public/templates/header.tpl
View File

@@ -54,7 +54,6 @@
<div class="navbar-collapse collapse navbar-ex1-collapse"> <div class="navbar-collapse collapse navbar-ex1-collapse">
<ul id="main-nav" class="nav navbar-nav"> <ul id="main-nav" class="nav navbar-nav">
<li> <li>
<a href="{relative_path}/recent"><i class="fa fa-fw fa-clock-o" title="[[global:header.recent]]"></i><span class="visible-xs-inline"> [[global:header.recent]]</span></a> <a href="{relative_path}/recent"><i class="fa fa-fw fa-clock-o" title="[[global:header.recent]]"></i><span class="visible-xs-inline"> [[global:header.recent]]</span></a>
</li> </li>
@@ -150,7 +149,7 @@
</li> </li>
<li class="hidden-xs"> <li class="hidden-xs">
<a id="search-button" class="hide"><i class="fa fa-search"></i></a> <a href="#" id="search-button" class="hide"><i class="fa fa-search"></i></a>
</li> </li>
</ul> </ul>