dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mw.widgets.visibleLengthLimit: Apply number conversion to the limit"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki
/
mediawiki.ForeignStructuredUpload.BookletLayout.js
diff --git
a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index
ac2bb02
..
7d4ed53
100644
(file)
--- a/
resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/
resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@
-113,8
+113,7
@@
} )
);
}
} )
);
}
- ).then(
- null,
+ ).catch(
// Always resolve, never reject
function () { return $.Deferred().resolve(); }
);
// Always resolve, never reject
function () { return $.Deferred().resolve(); }
);
@@
-393,7
+392,8
@@
if ( file && file.type === 'image/jpeg' ) {
fileReader = new FileReader();
fileReader.onload = function () {
if ( file && file.type === 'image/jpeg' ) {
fileReader = new FileReader();
fileReader.onload = function () {
- var fileStr, arr, i, metadata;
+ var fileStr, arr, i, metadata,
+ jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' );
if ( typeof fileReader.result === 'string' ) {
fileStr = fileReader.result;
if ( typeof fileReader.result === 'string' ) {
fileStr = fileReader.result;
@@
-407,7
+407,7
@@
}
try {
}
try {
- metadata =
mw.libs.
jpegmeta( fileStr, file.name );
+ metadata = jpegmeta( fileStr, file.name );
} catch ( e ) {
metadata = null;
}
} catch ( e ) {
metadata = null;
}