From c4697feede78bb0fb25ae026345dc5f16e9a7e6f Mon Sep 17 00:00:00 2001 From: David Cormier Date: Tue, 8 Oct 2013 10:25:20 -0400 Subject: [PATCH] Put class definitions on top --- js/models.js | 143 +++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 72 deletions(-) diff --git a/js/models.js b/js/models.js index 9f930f6..f3174e5 100644 --- a/js/models.js +++ b/js/models.js @@ -5,6 +5,77 @@ var models = angular.module('weechatModels', []); models.service('models', ['colors', function(colors) { + /* + * Buffer class + */ + this.Buffer = function(message) { + // weechat properties + var fullName = message['full_name'] + var pointer = message['pointers'][0] + var lines = [] + var active = false; + var notification = false; + + /* + * Adds a line to this buffer + * + * @param line the BufferLine object + * @return undefined + */ + var addLine = function(line) { + lines.push(line); + } + + return { + id: pointer, + fullName: fullName, + lines: lines, + addLine: addLine + } + + } + + /* + * BufferLine class + */ + this.BufferLine = function(weechatBufferLine) { + + /* + * Parse the text elements from the buffer line added + * + * @param message weechat message + */ + function parseLineAddedTextElements(message) { + var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']); + + var buffer = message['objects'][0]['content'][0]['buffer']; + text_elements = _.union(prefix, text); + text_elements =_.map(text_elements, function(text_element) { + if ('fg' in text_element) { + text_element['fg'] = colors.prepareCss(text_element['fg']); + } + // TODO: parse background as well + + return text_element; + }); + return text_elements; + } + + + var buffer = message['objects'][0]['content'][0]['buffer']; + var date = message['objects'][0]['content'][0]['date']; + var text = colors.parse(message['objects'][0]['content'][0]['message']); + var content = parseLineAddedTextElements(message); + + return { + content: content, + date: date, + buffer: buffer, + text: text[0]['text'], + } + + } + var BufferList = [] activeBuffer = null; @@ -91,76 +162,4 @@ models.service('models', ['colors', function(colors) { var firstBuffer = _.keys(this.model['buffers'])[0]; this.setActiveBuffer(firstBuffer); } - - - /* - * Buffer class - */ - this.Buffer = function(message) { - // weechat properties - var fullName = message['full_name'] - var pointer = message['pointers'][0] - var lines = [] - var active = false; - var notification = false; - - /* - * Adds a line to this buffer - * - * @param line the BufferLine object - * @return undefined - */ - var addLine = function(line) { - lines.push(line); - } - - return { - id: pointer, - fullName: fullName, - lines: lines, - addLine: addLine - } - - } - - /* - * BufferLine class - */ - this.BufferLine = function(weechatBufferLine) { - - /* - * Parse the text elements from the buffer line added - * - * @param message weechat message - */ - function parseLineAddedTextElements(message) { - var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']); - - var buffer = message['objects'][0]['content'][0]['buffer']; - text_elements = _.union(prefix, text); - text_elements =_.map(text_elements, function(text_element) { - if ('fg' in text_element) { - text_element['fg'] = colors.prepareCss(text_element['fg']); - } - // TODO: parse background as well - - return text_element; - }); - return text_elements; - } - - - var buffer = message['objects'][0]['content'][0]['buffer']; - var date = message['objects'][0]['content'][0]['date']; - var text = colors.parse(message['objects'][0]['content'][0]['message']); - var content = parseLineAddedTextElements(message); - - return { - content: content, - date: date, - buffer: buffer, - text: text[0]['text'], - } - - } }]);