Version 3.4.9

upload/public/js/ipb.js

@@ -1673,16 +1673,19 @@ _global.prototype.global = {
 				
 				if ( collapsed )
 				{
-					var wrapper = new Element( 'div', {'class': '_quote-wrapper' } ).update( el.innerHTML );
-					el.update( wrapper );
-					el.down('div._quote-wrapper').hide();
-					el.insert( new Element( 'p', { 'class': '___x clickable' } ).update( ipb.lang['quote_expand'] ) );
-					
-					el.down('p.___x').on( 'click', function( e, elem )
+					// Hide this element
+					el.hide();
+
+					// Create a new blockquote that will be our 'clickable' area
+					var bq = new Element( 'blockquote', { 'class': 'ipsBlockquote built clickable' } ).update( ipb.lang['quote_expand'] );
+
+					bq.on( 'click', function( e, elem )
 					{
-						elem.up('blockquote').down('div._quote-wrapper').show();
-						elem.hide();
+						el.show();
+						bq.remove();
 					} );
+
+					el.insert( { before: bq } );
 				}
 			}
 		} );
@@ -4241,15 +4244,23 @@ _popup.prototype.Popup = Class.create({
 	
 	update: function( content, evalScript )
 	{
+		var scripts = [];
+		
 		if( Object.isElement( content ) ){
 			this.inner.insert( { bottom: content } );
 		} else {
+			// Get the scripts we'll need to execute
+			scripts = content.extractScripts();
+			content = content.stripScripts();
+
 			this.inner.update( content );
 		}
-		
+
 		// Should this popup eval scripts? Default is YES
-		if( Object.isUndefined( evalScript ) || evalScript != false ){
-			this.inner.innerHTML.evalScripts();
+		if( ( Object.isUndefined( evalScript ) || evalScript != false ) && this.options.evalScript ){
+			scripts.map( function (script) {
+				eval( script );
+			});
 		}
 	},