From c251c3b74c6735f1a7ff92bdf7db72789454d120 Mon Sep 17 00:00:00 2001 From: David Cormier Date: Tue, 17 Dec 2013 15:48:43 -0500 Subject: [PATCH] Fix is already defined errors --- js/irc-utils.js | 9 +++++---- js/models.js | 4 ++-- js/plugins.js | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/js/irc-utils.js b/js/irc-utils.js index ed0ee10..6bd3c31 100644 --- a/js/irc-utils.js +++ b/js/irc-utils.js @@ -122,10 +122,11 @@ var IrcUtils = { // iterating nicks at the beginning? var m = beforeCaret.match(new RegExp('^([a-zA-Z0-9_\\\\\\[\\]{}^`|-]+)' + suf + ' $')); + var newNick = null; if (m) { if (doIterate) { // try iterating - var newNick = IrcUtils._nextNick(iterCandidate, m[1], searchNickList); + newNick = IrcUtils._nextNick(iterCandidate, m[1], searchNickList); beforeCaret = newNick + suf + ' '; return { text: beforeCaret + afterCaret, @@ -143,7 +144,7 @@ var IrcUtils = { m = beforeCaret.match(/^([a-zA-Z0-9_\\\[\]{}^`|-]+)$/); if (m) { // try completing - var newNick = IrcUtils._completeSingleNick(m[1], searchNickList); + newNick = IrcUtils._completeSingleNick(m[1], searchNickList); if (newNick === null) { // no match return ret; @@ -166,7 +167,7 @@ var IrcUtils = { if (m) { if (doIterate) { // try iterating - var newNick = IrcUtils._nextNick(iterCandidate, m[2], searchNickList); + newNick = IrcUtils._nextNick(iterCandidate, m[2], searchNickList); beforeCaret = m[1] + newNick + ' '; return { text: beforeCaret + afterCaret, @@ -184,7 +185,7 @@ var IrcUtils = { m = beforeCaret.match(/^(.* )([a-zA-Z0-9_\\\[\]{}^`|-]+)$/); if (m) { // try completing - var newNick = IrcUtils._completeSingleNick(m[2], searchNickList); + newNick = IrcUtils._completeSingleNick(m[2], searchNickList); if (newNick === null) { // no match return ret; diff --git a/js/models.js b/js/models.js index 65a9f32..b8fb1df 100644 --- a/js/models.js +++ b/js/models.js @@ -63,7 +63,7 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter) * Deletes a nick from nicklist */ var delNick = function(group, nick) { - var group = nicklist[group]; + group = nicklist[group]; group.nicks = _.filter(group.nicks, function(n) { return n.name != nick.name;}); flatnicklist = getFlatNicklist(); /* @@ -79,7 +79,7 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter) * Updates a nick in nicklist */ var updateNick = function(group, nick) { - var group = nicklist[group]; + group = nicklist[group]; for(i in group.nicks) { if(group.nicks[i].name == nick.name) { group.nicks[i] = nick; diff --git a/js/plugins.js b/js/plugins.js index dd74060..e4e3a77 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -60,13 +60,13 @@ plugins.service('plugins', ['userPlugins', '$sce', function(userPlugins, $sce) { var nsfw = false; if (message.text.match(nsfwRegexp)) { - var nsfw = true; + nsfw = true; visible = false; } var pluginContent = plugins[i].contentForMessage(message.text); if (pluginContent) { - var pluginContent = {'visible': visible, + pluginContent = {'visible': visible, 'content': $sce.trustAsHtml(pluginContent), 'nsfw': nsfw, 'name': plugins[i].name }; @@ -205,7 +205,7 @@ plugins.factory('userPlugins', function() { var content = null; if (url) { - var url = url[0]; /* Actually parse one url per message */ + url = url[0]; /* Actually parse one url per message */ if (url.match(/png$|gif$|jpg$|jpeg$/)) { /* A fukung.net URL may end by an image extension but is not a direct link. */