http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89960
Revision: 89960
Author: neilk
Date: 2011-06-13 13:48:58 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
bring back lightbox-ish preview
Modified Paths:
--------------
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-06-13
13:01:20 UTC (rev 89959)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-06-13
13:48:58 UTC (rev 89960)
@@ -622,10 +622,7 @@
src:
image.src
} )
.css( {
- //'position':
'absolute',
- //'top': '50%',
- //'height':
height.toString() + 'px',
- 'margin-top': (
parseInt( ( 100 - image.height * scaling ) / 2, 10 ) ).toString() + 'px'
+ 'margin-top': (
parseInt( ( height - image.height * scaling ) / 2, 10 ) ).toString() + 'px'
} )
)
);
@@ -658,7 +655,38 @@
},
+ /**
+ * set up lightbox behavior for non-complete thumbnails
+ * TODO center this
+ * @param selector
+ */
+ setLightBox: function( selector ) {
+ var _this = this;
+ var $imgDiv = $j( '<div></div>' ).css( 'text-align', 'center' );
+ $j( selector )
+ .click( function() {
+ // get large preview image
+ // open large preview in modal dialog box
+ $j( '<div class="mwe-upwiz-lightbox"></div>' )
+ .append( $imgDiv )
+ .dialog( {
+ 'width':
mw.UploadWizard.config[ 'largeThumbnailWidth' ],
+ 'height':
mw.UploadWizard.config[ 'largeThumbnailMaxHeight' ],
+ 'autoOpen': true,
+ 'title': gM(
'mwe-upwiz-image-preview' ),
+ 'modal': true,
+ 'resizable': false
+ } );
+ _this.setThumbnail(
+ $imgDiv,
+ mw.UploadWizard.config[
'largeThumbnailWidth' ],
+ mw.UploadWizard.config[
'largeThumbnailMaxHeight' ]
+ );
+ return false;
+ } ); // close thumbnail click function
+ },
+
/**
* Given a filename like "Foo.jpg", get the URL to that filename,
assuming the browser is on the same wiki.
* Candidate for a utility function...
@@ -678,8 +706,8 @@
/**
- * Object that reperesents the entire multi-step Upload Wizard
- */
+* Object that reperesents the entire multi-step Upload Wizard
+*/
mw.UploadWizard = function( config ) {
this.uploads = [];
@@ -1589,7 +1617,7 @@
var thumbnailDiv = $j( '<div></div>' ).addClass(
'mwe-upwiz-thumbnail' );
$j( '#mwe-upwiz-deeds-thumbnails' ).append( thumbnailDiv );
_this.upload.setThumbnail( thumbnailDiv,
mw.UploadWizard.config[ 'thumbnailWidth' ], mw.UploadWizard.config[
'thumbnailMaxHeight' ] );
- _this.upload.deedThumbnailDiv = thumbnailDiv;
+ _this.upload.setLightBox( thumbnailDiv );
}
};
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2011-06-13 13:01:20 UTC (rev 89959)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2011-06-13 13:48:58 UTC (rev 89960)
@@ -453,6 +453,7 @@
populate: function() {
var _this = this;
_this.upload.setThumbnail( _this.thumbnailDiv,
mw.UploadWizard.config['thumbnailWidth'],
mw.UploadWizard.config['thumbnailMaxHeight'] );
+ _this.upload.setLightBox( _this.thumbnailDiv );
_this.prefillDate();
_this.prefillSource();
_this.prefillAuthor();
Modified:
trunk/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
2011-06-13 13:01:20 UTC (rev 89959)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
2011-06-13 13:48:58 UTC (rev 89960)
@@ -95,6 +95,7 @@
mw.UploadWizard.config[ 'thumbnailWidth' ],
mw.UploadWizard.config[ 'thumbnailMaxHeight' ]
);
+ _this.upload.setLightBox( $preview );
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
