Merge "mw.ForeignStructuredUpload.BookletLayout: Use lastModified or EXIF date"

diff --combined resources/Resources.php
index 1037528,d43657b..ad2f12c
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1261,6 -1261,7 +1261,7 @@@ return array
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.jqueryMsg',
                        'moment',
+                       'mediawiki.libs.jpegmeta',
                ),
                'messages' => array(
                        'foreign-structured-upload-form-label-own-work',
@@@ -1478,7 -1479,6 +1479,7 @@@
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.redirect.js',
                'dependencies' => 'jquery.client',
                'position' => 'top',
 +              'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.action.view.redirectPage' => array(
                'position' => 'top',
@@@ -1867,6 -1867,16 +1868,6 @@@
        'mediawiki.special.watchlist' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
        ),
 -      'mediawiki.special.javaScriptTest' => array(
 -              'scripts' => 'resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js',
 -              'messages' => array_merge( Skin::getSkinNameMessages(), array(
 -                      'colon-separator',
 -                      'javascripttest-pagetext-skins',
 -              ) ),
 -              'dependencies' => 'mediawiki.Uri',
 -              'position' => 'top',
 -              'targets' => array( 'desktop', 'mobile' ),
 -      ),
        'mediawiki.special.version' => array(
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
        ),