Sorunome 11 years ago
parent
commit
442c1c4790

+ 11 - 11
app/OmnomIRC.js

@@ -149,6 +149,17 @@ if(cluster.isMaster){
 		var c = msg[0];
 		msg = msg.substr(1);
 		
+			message = function(room,from,message,origin,socket){
+				if(typeof socket == 'undefined'){
+					socket = io.sockets.in(room);
+				}
+				socket.emit('message',{
+					message: message,
+					room: room,
+					from: from,
+					origin: origin
+				})
+			};
 		switch(c){
 			case 'Q':
 				if(typeof app != 'undefined' && typeof irc == 'undefined'){
@@ -422,17 +433,6 @@ if(cluster.isMaster){
 					});
 				}
 			},
-			message = function(room,from,message,origin,socket){
-				if(typeof socket == 'undefined'){
-					socket = io.sockets.in(room);
-				}
-				socket.emit('message',{
-					message: message,
-					room: room,
-					from: from,
-					origin: origin
-				})
-			},
 			fromServer = function(room,message,socket){
 				if(typeof socket == 'undefined'){
 					socket = io.sockets.in(room);

+ 2 - 0
app/www/data/plugins/oldMessages/script.js

@@ -64,6 +64,8 @@ hook("send",function(msg,room){
 	}
 	$.localStorage('oldMessages-'+room,oldMessages.join("\n"));
 	$('#input').data('oldMessageCounter',oldMessages.length);
+	//$o.event('OldMessages','added old message');
+	return true;
 });
 hook("stop",function(name){
 	$('#input').off(oldMessagesKeyHandle);

+ 0 - 15
app/www/data/plugins/test/script.js

@@ -1,15 +0,0 @@
-hook('message',function(msg,from,room,origin){
-	if(msg =='funny'){
-		$o.event('test','yay');
-		$o.chat.send(origin,room);
-	}
-});
-hook('send',function(msg,room){
-	return msg.toLowerCase()!='the game';
-});
-hook('start',function(){
-	$('body').show();
-});
-hook('stop',function(){
-	$('body').hide();
-});

+ 2 - 0
app/www/js/omnomirc.js

@@ -319,6 +319,7 @@
 			$: window.jQuery,
 			jQuery: window.jQuery,
 			$o: $o,
+			test: "hello world",
 			fragment: function(){
 				return document.createDocumentFragment();
 			}
@@ -1173,6 +1174,7 @@
 								$: window.jQuery,
 								$o: window.OmnomIRC,
 								OmnomIRC: window.OmnomIRC,
+								test: "test"
 							};
 							runInSandbox(data,sandbox);
 							runHook('themechange',[v]);