From: Vlad Chernushevich Date: Mon, 24 Jun 2013 22:29:07 +0000 (+0200) Subject: − Update code indentation X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bd85cbdb0553f83ad1f20d279307b4f119d1e670;p=KiwiIRC.git − Update code indentation − Apply var naming convention − Add favicon.js to build.js --- diff --git a/client/assets/src/build.js b/client/assets/src/build.js index 8b4f92b..28886d5 100644 --- a/client/assets/src/build.js +++ b/client/assets/src/build.js @@ -51,6 +51,7 @@ var source_files = [ __dirname + '/views/application.js', __dirname + '/views/apptoolbar.js', __dirname + '/views/controlbox.js', + __dirname + '/views/favicon.js', __dirname + '/views/mediamessage.js', __dirname + '/views/member.js', __dirname + '/views/memberlist.js', diff --git a/client/assets/src/views/favicon.js b/client/assets/src/views/favicon.js index 44077c2..1393d7a 100644 --- a/client/assets/src/views/favicon.js +++ b/client/assets/src/views/favicon.js @@ -1,132 +1,132 @@ _kiwi.view.Favicon = Backbone.View.extend({ - initialize: function () { - var that = this, - $win = $(window); - - this.hasFocus = true; - this.highlightCount = 0; - - this.originalFavicon = $('link[rel~="icon"]')[0].href; - - $win.on('focus', function () { - that.hasFocus = true; - that._resetHighlights(); - }); - $win.on('blur', function () { - that.hasFocus = false; - }); - }, - - newHighlight: function () { - var that = this; - if (!this.hasFocus) { - this.highlightCount++; - this._drawFavicon(function(canvas) { - var bubbleCanvas = that._drawBubble(that.highlightCount.toString(), canvas); - that._refreshFavicon(bubbleCanvas.toDataURL()); - }); - } - }, - - _resetHighlights: function () { - var that = this; - this.highlightCount = 0; - this._drawFavicon(function(canvas) { - that._refreshFavicon(canvas.toDataURL()); - }); - }, - - _drawFavicon: function (callback) { - var that = this, - context = this._createCanvas().getContext('2d'), - faviconImage = new Image(); - - // Allow cross origin resource requests - faviconImage.crossOrigin = 'anonymous'; - // Trigger the load event - faviconImage.src = this.originalFavicon; - - faviconImage.onload = function() { - // Draw the favicon itself - context.drawImage(faviconImage, 0, 0, faviconImage.width, faviconImage.height); - callback(canvas); - }; - }, - - _drawBubble: function (label, canvas) { - var letterSpacing = -1.5, - textWidth = 0, textHidth = 0, - context = test = canvas.getContext('2d'), - canvasWidth = canvas.width, - canvasHeight = canvas.height; - - // A hacky solution for letter-spacing, but works well with small favicon text - CanvasRenderingContext2D.prototype.renderText = function (text, x, y, letterSpacing) { - if (!text || typeof text !== 'string' || text.length === 0) { - return; - } - if (typeof letterSpacing === 'undefined') { - letterSpacing = 0; - } - // letterSpacing of 0 means normal letter-spacing - var characters = String.prototype.split.call(text, ''), - index = 0, - current, - currentPosition = x, - align = 1; - - if (this.textAlign === 'right') { - characters = characters.reverse(); - align = -1; - } else if (this.textAlign === 'center') { - var totalWidth = 0; - for (var i = 0; i < characters.length; i++) { - totalWidth += (this.measureText(characters[i]).width + letterSpacing); - } - currentPosition = x - (totalWidth / 2); - } - - while (index < text.length) { - current = characters[index++]; - this.fillText(current, currentPosition, y); - currentPosition += (align * (this.measureText(current).width + letterSpacing)); - } - } - - // Setup a test canvas to get text width - test.font = context.font = 'bold 10px Arial'; - test.textAlign = 'right'; - test.renderText(label, 0, 0, letterSpacing); - - // Calculate text width based on letter spacing and padding - textWidth = test.measureText(label).width + letterSpacing * (label.length - 1) + 2; - textHeight = 9; - - // Set bubble parameters - bubbleX = canvasWidth - textWidth; - bubbleY = canvasHeight - textHeight; - - // Draw bubble background - context.fillStyle = 'red'; - context.fillRect(bubbleX, bubbleY, textWidth, textHeight); - - // Draw the text - context.fillStyle = 'white'; - context.renderText(label, canvasWidth - 1, canvasHeight - 1, letterSpacing); - - return canvas; - }, - - _refreshFavicon: function (url) { - $('link[rel~="icon"]').remove(); - $('').appendTo($('head')); - }, - - _createCanvas: function () { - canvas = document.createElement('canvas'); - canvas.width = 16; - canvas.height = 16; - - return canvas; - } + initialize: function () { + var that = this, + $win = $(window); + + this.has_focus = true; + this.highlight_count = 0; + + this.original_favicon = $('link[rel~="icon"]')[0].href; + + $win.on('focus', function () { + that.has_focus = true; + that._resetHighlights(); + }); + $win.on('blur', function () { + that.has_focus = false; + }); + }, + + newHighlight: function () { + var that = this; + if (!this.has_focus) { + this.highlight_count++; + this._drawFavicon(function(canvas) { + var bubbleCanvas = that._drawBubble(that.highlight_count.toString(), canvas); + that._refreshFavicon(bubbleCanvas.toDataURL()); + }); + } + }, + + _resetHighlights: function () { + var that = this; + this.highlight_count = 0; + this._drawFavicon(function(canvas) { + that._refreshFavicon(canvas.toDataURL()); + }); + }, + + _drawFavicon: function (callback) { + var that = this, + context = this._createCanvas().getContext('2d'), + favicon_image = new Image(); + + // Allow cross origin resource requests + favicon_image.crossOrigin = 'anonymous'; + // Trigger the load event + favicon_image.src = this.original_favicon; + + favicon_image.onload = function() { + // Draw the favicon itself + context.drawImage(favicon_image, 0, 0, favicon_image.width, favicon_image.height); + callback(canvas); + }; + }, + + _drawBubble: function (label, canvas) { + var letter_spacing = -1.5, + text_width = 0, text_height = 0, + context = test = canvas.getContext('2d'), + canvas_width = canvas.width, + canvas_height = canvas.height; + + // A hacky solution for letter-spacing, but works well with small favicon text + CanvasRenderingContext2D.prototype.renderText = function (text, x, y, letter_spacing) { + if (!text || typeof text !== 'string' || text.length === 0) { + return; + } + if (typeof letter_spacing === 'undefined') { + letter_spacing = 0; + } + // letter_spacing of 0 means normal letter-spacing + var characters = String.prototype.split.call(text, ''), + index = 0, + current, + currentPosition = x, + align = 1; + + if (this.textAlign === 'right') { + characters = characters.reverse(); + align = -1; + } else if (this.textAlign === 'center') { + var totalWidth = 0; + for (var i = 0; i < characters.length; i++) { + totalWidth += (this.measureText(characters[i]).width + letter_spacing); + } + currentPosition = x - (totalWidth / 2); + } + + while (index < text.length) { + current = characters[index++]; + this.fillText(current, currentPosition, y); + currentPosition += (align * (this.measureText(current).width + letter_spacing)); + } + } + + // Setup a test canvas to get text width + test.font = context.font = 'bold 10px Arial'; + test.textAlign = 'right'; + test.renderText(label, 0, 0, letter_spacing); + + // Calculate text width based on letter spacing and padding + text_width = test.measureText(label).width + letter_spacing * (label.length - 1) + 2; + text_height = 9; + + // Set bubble parameters + bubbleX = canvas_width - text_width; + bubbleY = canvas_height - text_height; + + // Draw bubble background + context.fillStyle = 'red'; + context.fillRect(bubbleX, bubbleY, text_width, text_height); + + // Draw the text + context.fillStyle = 'white'; + context.renderText(label, canvas_width - 1, canvas_height - 1, letter_spacing); + + return canvas; + }, + + _refreshFavicon: function (url) { + $('link[rel~="icon"]').remove(); + $('').appendTo($('head')); + }, + + _createCanvas: function () { + canvas = document.createElement('canvas'); + canvas.width = 16; + canvas.height = 16; + + return canvas; + } }); \ No newline at end of file