Version 3.4.5

upload/public/js/ips.attach.js

@@ -11,16 +11,22 @@
 
 var _attach = window.IPBoard;
 
+var IPS_UPLOADER_INIT_DONE = false;
+
 _attach.prototype.attach = {
 	uploaders: [],
 	template: '',
 	_doneJson: false,
+	optionsCache: {},
 	
 	init: function()
 	{
 		Debug.write("Initializing ips.attach.js");
 		
+		IPS_UPLOADER_INIT_DONE = true;
+		
 		document.observe("dom:loaded", function(){
+			
 			//ipb.attach.initUploaders();
 		});
 	},
@@ -68,7 +74,12 @@ _attach.prototype.attach = {
 			if( $( 'nojs_' + id + '_2' ) ){
 				$( 'nojs_' + id + '_2' ).hide();
 			}
-		}		
+		}
+		
+		ipb.attach.optionsCache    = options;
+		ipb.attach.optionsCache.id = id;
+		
+		Debug.write("Uploader registered");
 	},
 	
 	switchUploadType: function( mode )
@@ -236,8 +247,8 @@ _attach.prototype.attach = {
 	{
 		if( ipb.attach._doneJson ){ return; }
 
-		ipb.attach.uploaders[ 'attach_' + id ].json = json;
-		ipb.attach.uploaders[ 'attach_' + id ].isReady();
+		ipb.attach.uploaders[ ipb.attach.optionsCache.id ].json = json;
+		ipb.attach.uploaders[ ipb.attach.optionsCache.id ].isReady();
 		
 		// #33731: Opera would constantly call this function, causing the attachment
 		// list to break. As a workaround, we set this to true so that it only
@@ -357,6 +368,8 @@ _attach.prototype.attachTraditional = Class.create({
 		this.template = template;
 		this.options = options;
 		
+		this.options.prefix = ( typeof( this.options.prefix ) != 'undefined' ) ? this.options.prefix : '';
+		
 		/* Build iframe */
 		this.iframe = new Element('iframe', { 	id: 'iframeAttach_' + this.options['attach_rel_id'],
 		 										name: 'iframeAttach_' + this.options['attach_rel_id'],
@@ -369,6 +382,7 @@ _attach.prototype.attachTraditional = Class.create({
 												tabindex: '1'
 											}).setStyle({
 												width: '500px',
+												zIndex: 30000,
 												height: '25px',
 												overflow: 'hidden',
 												backgroundColor: 'transparent'
@@ -841,6 +855,12 @@ _attach.prototype.attachSWF = Class.create({
 	*/
 	_uploadSuccess: function( file, serverData )
 	{
+		/* Mark W's fix for invisible header chars */
+		while ( serverData.substr( 0, 1 ) != '{' )
+		{
+			serverData = serverData.substr( 1 );
+		}
+
 		if( !serverData.isJSON() ){ this._setStatus( file.index, 'error' ); this._updateInfo( file.index, ipb.lang['silly_server'] ); }
 		returnedObj = serverData.evalJSON();
 		
@@ -1073,3 +1093,5 @@ jimAuld.utils.flashsniffer = {
 };
 jimAuld.utils.flashsniffer.detect();
 
+var IPS_UPLOADER_LOADED = true;
+