Browse Source

Fixed some plugin stuff

Sorunome 11 years ago
parent
commit
8a7cd28cb4
2 changed files with 34 additions and 48 deletions
  1. 15 13
      app/www/data/plugins/linkNicks/script.js
  2. 19 35
      app/www/data/plugins/oldMessages/script.js

+ 15 - 13
app/www/data/plugins/linkNicks/script.js

@@ -22,18 +22,20 @@ hook('message',function(msg,from,room,origin){
 			before = parseMsg.substring(0,31);
 			after = parseMsg.substring(parseMsg.indexOf(" ",31));
 		}
-		newHTML = $(fragment())
-			.append(before)
-			.append(
-				$('<a>')
-						.attr('href','http:/'+'/www.omnimaga.org/index.php?action=ezportal;sa=page;p=13&userSearch='+nick)
-						.text(nick)
-			).append(after);
-		$o.event('links',newHTML.html());
-		//$($('#content-list').children().last().children("span").get(1)).html(newHTML);
-		//$($($o.ui.tabs.current().body).children().last().children().get(1)).html(newHTML);
-		//$('#content-list > li:nth-last-child(1) > span:nth-last-child(1)').html(newHTML);
-		$($o.ui.tabs.current().body).children().last().children().slice(1,2)
-			.add('#content-list > li:nth-last-child(1) > span:nth-last-child(1)').html(newHTML);
+		if(nick.indexOf('<a')==-1){
+			newHTML = $(fragment())
+				.append(before)
+				.append(
+					$('<a>')
+							.attr('href','http:/'+'/www.omnimaga.org/index.php?action=ezportal;sa=page;p=13&userSearch='+nick)
+							.text(nick)
+				).append(after);
+			$o.event('links',newHTML.html());
+			//$($('#content-list').children().last().children("span").get(1)).html(newHTML);
+			//$($($o.ui.tabs.current().body).children().last().children().get(1)).html(newHTML);
+			//$('#content-list > li:nth-last-child(1) > span:nth-last-child(1)').html(newHTML);
+			$($o.ui.tabs.current().body).children().last().children().slice(1,2)
+				.add('#content-list > li:nth-last-child(1) > span:nth-last-child(1)').html(newHTML);
+		}
 	}
 });

+ 19 - 35
app/www/data/plugins/oldMessages/script.js

@@ -1,27 +1,23 @@
-hook("start",function(name){
-	$("#input").keydown(function oldMessagesKeyHandle(e){
-		var oldMessages = [],
-			room = room = $o.ui.tabs.current().name,
-			temp = $.localStorage('oldMessages-'+room);
-		if (temp!=null){
-			oldMessages = temp.split("\n");
-		}
-		if ($('#input').data('oldMessageCounter')==oldMessages.length){
+hook('start',function(name){
+	$('#input').keydown(function oldMessagesKeyHandle(e){
+		var room = $o.ui.tabs.current().name,
+			oldMessages = ($.localStorage('oldMessages-'+room)||[]);
+		if($('#input').data('oldMessageCounter')==oldMessages.length){
 			$('#input').data('currentMessage',$('#input').val());
 		}
-		if (oldMessages.length!=0){
+		if(oldMessages.length!=0){
 			switch(e.which){
 				case 38:
-					if ($('#input').data('oldMessageCounter')!=0){
+					if($('#input').data('oldMessageCounter')!=0){
 						$('#input').data('oldMessageCounter',$('#input').data('oldMessageCounter')-1);
 					}
 					$('#input').val(oldMessages[$('#input').data('oldMessageCounter')]);
 				break;
 				case 40:
-					if ($('#input').data('oldMessageCounter')!=oldMessages.length){
+					if($('#input').data('oldMessageCounter')!=oldMessages.length){
 						$('#input').data('oldMessageCounter',$('#input').data('oldMessageCounter')+1);
 					}
-					if ($('#input').data('oldMessageCounter')==oldMessages.length){
+					if($('#input').data('oldMessageCounter')==oldMessages.length){
 						$('#input').val($('#input').data('currentMessage'));
 					}else{
 						$('#input').val(oldMessages[$('#input').data('oldMessageCounter')]);
@@ -34,39 +30,27 @@ hook("start",function(name){
 		'currentMessage':''
 	});
 });
-hook("tabswitch",function(newT,oldT){
-	var oldMessages = [],
-		room = newT.name,
-		temp = $.localStorage('oldMessages-'+room);
-	if (temp!=null){
-		oldMessages = temp.split("\n");
-	}
+hook('tabswitch',function(newT,oldT){
+	var room = newT.name,
+		oldMessages = ($.localStorage('oldMessages-'+room)||[]);
 	$('#input').data('oldMessageCounter',oldMessages.length);
 });
-hook("load",function(){
-	var oldMessages = [],
-		room = $o.ui.tabs.current().name,
-		temp = $.localStorage('oldMessages-'+room);
-	if (temp!=null){
-		oldMessages = temp.split("\n");
-	}
+hook('load',function(){
+	var room = newT.name,
+		oldMessages = ($.localStorage('oldMessages-'+room)||[]);
 	$('#input').data('oldMessageCounter',oldMessages.length);
 });
-hook("send",function(msg,room){
-	var oldMessages = [],
-		temp = $.localStorage('oldMessages-'+room);
-	if (temp!=null){
-		oldMessages = temp.split("\n");
-	}
+hook('send',function(msg,room){
+	var oldMessages = ($.localStorage('oldMessages-'+room)||[]);
 	oldMessages.push(msg);
 	if (oldMessages.length>20){
 		oldMessages.shift();
 	}
-	$.localStorage('oldMessages-'+room,oldMessages.join("\n"));
+	$.localStorage('oldMessages-'+room,oldMessages);
 	$('#input').data('oldMessageCounter',oldMessages.length);
 	//$o.event('OldMessages','added old message');
 	return true;
 });
-hook("stop",function(name){
+hook('stop',function(name){
 	$('#input').off(oldMessagesKeyHandle);
 });