Merge pull request #167 from WildcardSearch/maintenance

3.1.3 Release

README.md

@@ -1,4 +1,4 @@
-## MentionMe 3.1.2
+## MentionMe 3.1.3
 
 A plugin for MyBB 1.8.x that allows Twitter-style tagging and integration with [MyAlerts](https://github.com/euantorano/MyAlerts)
 

Upload/inc/plugins/MentionMe/forum.php

@@ -482,7 +482,7 @@ function mentionMeXMLHTTPgetNameCache()
 		"cached" => array(),
 		"inThread" => array(),
 	);
-	foreach ($nameCache as $key => $data) {
+	foreach ((array) $nameCache as $key => $data) {
 		$names['cached'][$key] = $data;
 	}
 

Upload/inc/plugins/MentionMe/install.php

@@ -98,7 +98,8 @@ function mention_info()
         'version' => MENTIONME_VERSION,
         'author' => $author,
         'authorsite' => 'http://www.rantcentralforums.com/',
-		'compatibility' => '18*'
+		'compatibility' => '18*',
+		'codename' => 'mention',
     );
 }
 
@@ -471,6 +472,12 @@ function mentionMeMyAlertsIntegrate()
 		$lang->load('mention');
 	}
 
+	if (!function_exists("myalerts_info") ||
+		myalerts_info()['version'] < "2.0.0" ||
+		$cache->read('mybbstuff_myalerts_alert_types')['mention']['code'] == 'mention') {
+		return;
+	}
+
 	$alertTypeManager = MybbStuff_MyAlerts_AlertTypeManager::createInstance($db, $cache);
 	$alertType = new MybbStuff_MyAlerts_Entity_AlertType();
 	$alertType->setCode("mention");

Upload/inc/plugins/mention.php

@@ -14,7 +14,7 @@
 
 // checked by other plugin files
 define('IN_MENTIONME', true);
-define('MENTIONME_VERSION', '3.1.2');
+define('MENTIONME_VERSION', '3.1.3');
 
 if (!class_exists('MentionMeCache')) {
 	require_once MYBB_ROOT . 'inc/plugins/MentionMe/classes/MentionMeCache.php';

Upload/jscripts/MentionMe/autocomplete.js

@@ -1292,7 +1292,7 @@ var MentionMe = (function($, m) {
 			rangeHelper = editor.getRangeHelper();
 
 			$iFrame = $("iframe");
-			$container = $iFrame.closest("div");
+			$container = $iFrame.closest("td");
 			$body = editor.getBody();
 
 			editor.keyUp(onKeyUp);
@@ -1339,8 +1339,13 @@ var MentionMe = (function($, m) {
 			var coords = $body.caret("offset", {
 					iframe: $iFrame[0],
 				}),
-				left = parseInt(coords.left) + 7,
-				top = parseInt(coords.top + $container.find("div.sceditor-toolbar").height()) + 2;
+				containerOffset = $container.offset(),
+				toolBarHeight = $container.find("div.sceditor-toolbar").height(),
+				fontSize = parseInt($currentNode.closest("div").css("fontSize").replace("px", "") / 2),
+				paddingLeft = parseInt($container.css("paddingLeft").replace("px", ""), 10),
+				paddingTop = parseInt($container.css("paddingTop").replace("px", ""), 10),
+				left = parseInt(coords.left, 10) + containerOffset.left + paddingLeft + fontSize + 2,
+				top = parseInt(coords.top + toolBarHeight) + containerOffset.top + paddingTop + 3;
 
 			popup.show(left, top);
 		}
@@ -1473,6 +1478,17 @@ var MentionMe = (function($, m) {
 			editor = CKEDITOR.instances[key];
 
 			editor.on("instanceReady", finalize);
+
+			if ($('#quick_reply_submit').length) {
+				$('#quick_reply_submit').click(function(e) {
+					if ($doc.length) {
+						$doc.unbind('keyup', onKeyUp);
+					}
+					setTimeout(function() {
+						$doc.keyup(onKeyUp);
+					}, 500);
+				});
+			}
 		}
 
 		/**