From 70d6fc08bddeb08a556fda8d6b37e376181fd20f Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 01:47:39 +0200 Subject: [PATCH 1/2] repaired define path --- app/Lib/Utilities/RequestAnimFrame.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 app/Lib/Utilities/RequestAnimFrame.js diff --git a/app/Lib/Utilities/RequestAnimFrame.js b/app/Lib/Utilities/RequestAnimFrame.js old mode 100644 new mode 100755 index 4682cae..1b7ce56 --- a/app/Lib/Utilities/RequestAnimFrame.js +++ b/app/Lib/Utilities/RequestAnimFrame.js @@ -1,4 +1,8 @@ -define(['Chuck/Settings'], function(Settings) { +define([ + 'Game/Config/Settings' +], + +function(Settings) { var requestAnimFrame = (function(){ From 68d08f4606e2130139f8e052065f3a3eced5b2b4 Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 01:52:44 +0200 Subject: [PATCH 2/2] changed notification center to singleton --- app/Game/Server/NotificationCenter.js | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-) mode change 100644 => 100755 app/Game/Server/NotificationCenter.js diff --git a/app/Game/Server/NotificationCenter.js b/app/Game/Server/NotificationCenter.js old mode 100644 new mode 100755 index 976c450..c8dbc4e --- a/app/Game/Server/NotificationCenter.js +++ b/app/Game/Server/NotificationCenter.js @@ -1,32 +1,30 @@ -define(function() { +define( - function NotificationCenter() { - this.topics = {}; - this.subUid = -1; - } + var NotificationCenter = { + topics: {}, + subUid: -1 + }; - NotificationCenter.prototype.trigger = function(topic, args) { - if (!this.topics[topic]) { + NotificationCenter.trigger = function(topic, args) { + if (!NotificationCenter.topics[topic]) { throw "No such topic " + topic + ". Could not trigger."; } - var subscribers = this.topics[topic]; + var subscribers = NotificationCenter.topics[topic]; var len = subscribers ? subscribers.length : 0; while (len--) { subscribers[len].func(topic, args); } - - return this; } - NotificationCenter.prototype.on = function(topic, func) { - if (!this.topics[topic]) { - this.topics[topic] = []; + NotificationCenter.on = function(topic, func) { + if (!NotificationCenter.topics[topic]) { + NotificationCenter.topics[topic] = []; } - var token = ( ++this.subUid ).toString(); - this.topics[topic].push({ + var token = ( ++NotificationCenter.subUid ).toString(); + NotificationCenter.topics[topic].push({ token: token, func: func }); @@ -34,19 +32,18 @@ define(function() { return token; } - NotificationCenter.prototype.off = function(token) { + NotificationCenter.off = function(token) { - for(var m in this.topics) { - if (this.topics[m]) { - for(var i = 0, j = this.topics[m].length; i < j; i++) { - if (this.topics[m][i].token === token) { - this.topics[m].splice(i, 1); + for(var m in NotificationCenter.topics) { + if (NotificationCenter.topics[m]) { + for(var i = 0, j = NotificationCenter.topics[m].length; i < j; i++) { + if (NotificationCenter.topics[m][i].token === token) { + NotificationCenter.topics[m].splice(i, 1); return token; } } } } - return this; } return NotificationCenter;