"

From 2013.igem.org

Revision as of 15:37, 5 June 2013 (view source) Franer (Talk | contribs) ← Older edit		Revision as of 16:03, 5 June 2013 (view source) Franer (Talk | contribs) Newer edit →
Line 302:		Line 302:
	/* all other text display is none*/		/* all other text display is none*/
	$('.texto').css({opacity: '0.0', display: 'none'});		$('.texto').css({opacity: '0.0', display: 'none'});
-	$text_loading.hide(); // Load its linked page into the div	+
	return false;		return false;
	});		});
Line 315:		Line 315:
	$('.texto').css({opacity:'0.0',display: 'none'});		$('.texto').css({opacity:'0.0',display: 'none'});
-	loadDiv(this);	+	new_link = $(this).attr('href')+ " #cargado";
-		+	$text_loading.show();
-	$('#text' + currentId).css({display: 'block'});	+
-	$('#text' + currentId).stop()	+	$('#textObj').load(new_link, function() {
-	.animate({opacity: '1'}, 1400, function(){});	+	/* hide text: */
		+	$text_loading.hide();
		+	$('#text' + currentId).css({display: 'block'});
		+	$('#text' + currentId).stop()
		+	.animate({opacity: '1'}, 1400, function(){});
		+	});
		+
Line 328:		Line 334:
	});		});
-	},
-
-
-	//Load external in div
-	loadDiv = function(link)
-	{
-
-	return $.Deferred(
-	function(dfd) {
-	new_link = $(link).attr('href')+ " #cargado";
-	/* show text: */
-	$text_loading.show();
-	$('#textObj').load(function(){
-	$text_loading.hide(); // Load its linked page into the div
-
-	});
-	$('#textObj').load(new_link);
-	}
-
-	).promise(); //devuelve el objeto cuando todas las animaciones terminaron
	},		},

---

Revision as of 16:03, 5 June 2013