[#43] eliminate popup description on morph gear hover

Eclipse-Phase-Unofficial · Sep 6, 2014 · a7414a4 · a7414a4
1 parent 6329d84
commit a7414a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 29 deletions.
diff --git a/src/Creator/version4/scripts/ajaxManager.js b/src/Creator/version4/scripts/ajaxManager.js
@@ -1758,7 +1758,7 @@ $(document).ready(function(){
 
 
          //click on gears for selection deselection
-        $(document).on('click', '.morphGear' ,function () {
+        $(document).on('click', '.addMorphGearIcon,.selMorphGearIcon' ,function () {
                 $.ajax({
                     type : 'POST',
                     contentType: 'application/x-www-form-urlencoded;charset=ISO-8859-1',
@@ -1894,31 +1894,7 @@ $(document).ready(function(){
 
 		//hover on morph implant or gear
          //click on implants for selection deselection
-        $(document).on('mouseover', '.morphGear' ,function () {
-                $.ajax({
-                    type : 'POST',
-                    contentType: 'application/x-www-form-urlencoded;charset=ISO-8859-1',
-                    url : dispatcherURL,
-                    dataType : 'json',
-                    data: {
-                            morphImplantGearHover : $(this).attr('id')
-                    },
-                    success : function(response){
-                            if(response.error) {
-                            	treatMessageError(response,DISPLAY_ON_4);
-                            }
-                    		else {                    		
-								$("#quaternary").load("quaternary-choice/gearMorphBMD.php");	
-							}
-                    },
-                    error : function(XMLHttpRequest, textStatus, errorThrown) {
-                                displayMessageOnQuaternary('There was an error.<br>'+textStatus+'<br>'+errorThrown+'<br>');     
-                    }
-				});
-				return false;
-        });
-
-        $(document).on('click', '.morphImplant' ,function () {
+        $(document).on('click', '.morphImplant,.morphGear' ,function () {
             $.ajax({
                 type : 'POST',
                 contentType: 'application/x-www-form-urlencoded;charset=ISO-8859-1',

diff --git a/src/Creator/version4/tertiary-choice/gears.php b/src/Creator/version4/tertiary-choice/gears.php
@@ -282,13 +282,13 @@ function getFormatedGearList($listFiltered,$morph){
 		             $htmlResult .= "<li>";
 					 if(isset($morph) && $_SESSION['cc']->haveGearOnMorph($m,$morph)){
 		            	if ($_SESSION['cc']->haveAdditionalGear($m,$morph)){
-		                     $htmlResult .= "		<label class='morphGear selGear' id='".$m->name."'>".$m->name."</label><label class='costInfo'>(".$m->getCost()." credits)</label><span class='selectedicone selGear' data-icon='&#x2b;'></span>";
+		                     $htmlResult .= "		<label class='morphGear selGear' id='".$m->name."'>".$m->name.getListStampHtml($m->name)."</label><label class='costInfo'>(".$m->getCost()." credits)</label><span class='selectedicone selGear selMorphGearIcon' id='".$m->name."' data-icon='&#x2b;'></span>";
 		                }else{
-		                     $htmlResult .= "		<label class='morphGear selGear' id='".$m->name."'>".$m->name."</label><label class='costInfo'>(base gear)</label><span class='selectedicone selGear' data-icon='&#x2b;'></span>";
+		                     $htmlResult .= "		<label class='morphGear selGear' id='".$m->name."'>".$m->name.getListStampHtml($m->name)."</label><label class='costInfo'>(base gear)</label><span class='selectedicone selGear selMorphGearIcon' id='".$m->name."' data-icon='&#x2b;'></span>";
 		                }
 
 	            	}else{
-	                    $htmlResult .= "		<label class='morphGear' id='".$m->name."'>".$m->name.getListStampHtml($m->name)."</label><label class='costInfo'>(".$m->getCost()." credits)</label>";
+	                    $htmlResult .= "		<label class='morphGear' id='".$m->name."'>".$m->name.getListStampHtml($m->name)."</label><label class='costInfo'>(".$m->getCost()." credits)</label><span class='addIcon addMorphGearIcon' id='".$m->name."' data-icon='&#x3a;'></span>";
 	            	}
 	            	$htmlResult .= "</li>";
             	}