@atlaskit/media-ui 22.3.5 → 22.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/dist/cjs/MediaButton.js +3 -0
- package/dist/cjs/MediaInlineCard/Frame/index.js +1 -0
- package/dist/cjs/customMediaPlayer/index.js +3 -2
- package/dist/cjs/customMediaPlayer/playbackSpeedControls.js +2 -1
- package/dist/cjs/customMediaPlayer/styled.js +1 -0
- package/dist/cjs/i18n/cs.js +1 -0
- package/dist/cjs/i18n/da.js +1 -0
- package/dist/cjs/i18n/de.js +1 -0
- package/dist/cjs/i18n/en.js +1 -0
- package/dist/cjs/i18n/en_GB.js +2 -1
- package/dist/cjs/i18n/es.js +1 -0
- package/dist/cjs/i18n/fi.js +1 -0
- package/dist/cjs/i18n/fr.js +1 -0
- package/dist/cjs/i18n/hu.js +1 -0
- package/dist/cjs/i18n/it.js +1 -0
- package/dist/cjs/i18n/ja.js +2 -1
- package/dist/cjs/i18n/ko.js +1 -0
- package/dist/cjs/i18n/nb.js +1 -0
- package/dist/cjs/i18n/nl.js +1 -0
- package/dist/cjs/i18n/pl.js +1 -0
- package/dist/cjs/i18n/pt_BR.js +1 -0
- package/dist/cjs/i18n/ru.js +1 -0
- package/dist/cjs/i18n/sv.js +1 -0
- package/dist/cjs/i18n/th.js +1 -0
- package/dist/cjs/i18n/tr.js +1 -0
- package/dist/cjs/i18n/uk.js +1 -0
- package/dist/cjs/i18n/vi.js +1 -0
- package/dist/cjs/i18n/zh.js +1 -0
- package/dist/cjs/i18n/zh_TW.js +1 -0
- package/dist/cjs/imageMetaData/index.js +83 -89
- package/dist/cjs/imageMetaData/metatags.js +35 -37
- package/dist/cjs/imageMetaData/parseJPEG.js +35 -37
- package/dist/cjs/imageMetaData/parsePNG.js +84 -88
- package/dist/cjs/imageMetaData/types.js +8 -8
- package/dist/cjs/util.js +42 -46
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/MediaInlineCard/Frame/index.js +1 -0
- package/dist/es2019/customMediaPlayer/index.js +1 -1
- package/dist/es2019/i18n/cs.js +1 -0
- package/dist/es2019/i18n/da.js +1 -0
- package/dist/es2019/i18n/de.js +1 -0
- package/dist/es2019/i18n/en.js +1 -0
- package/dist/es2019/i18n/en_GB.js +2 -1
- package/dist/es2019/i18n/es.js +1 -0
- package/dist/es2019/i18n/fi.js +1 -0
- package/dist/es2019/i18n/fr.js +1 -0
- package/dist/es2019/i18n/hu.js +1 -0
- package/dist/es2019/i18n/it.js +1 -0
- package/dist/es2019/i18n/ja.js +2 -1
- package/dist/es2019/i18n/ko.js +1 -0
- package/dist/es2019/i18n/nb.js +1 -0
- package/dist/es2019/i18n/nl.js +1 -0
- package/dist/es2019/i18n/pl.js +1 -0
- package/dist/es2019/i18n/pt_BR.js +1 -0
- package/dist/es2019/i18n/ru.js +1 -0
- package/dist/es2019/i18n/sv.js +1 -0
- package/dist/es2019/i18n/th.js +1 -0
- package/dist/es2019/i18n/tr.js +1 -0
- package/dist/es2019/i18n/uk.js +1 -0
- package/dist/es2019/i18n/vi.js +1 -0
- package/dist/es2019/i18n/zh.js +1 -0
- package/dist/es2019/i18n/zh_TW.js +1 -0
- package/dist/es2019/imageMetaData/types.js +6 -6
- package/dist/es2019/version.json +1 -1
- package/dist/esm/MediaInlineCard/Frame/index.js +1 -0
- package/dist/esm/customMediaPlayer/index.js +1 -1
- package/dist/esm/i18n/cs.js +1 -0
- package/dist/esm/i18n/da.js +1 -0
- package/dist/esm/i18n/de.js +1 -0
- package/dist/esm/i18n/en.js +1 -0
- package/dist/esm/i18n/en_GB.js +2 -1
- package/dist/esm/i18n/es.js +1 -0
- package/dist/esm/i18n/fi.js +1 -0
- package/dist/esm/i18n/fr.js +1 -0
- package/dist/esm/i18n/hu.js +1 -0
- package/dist/esm/i18n/it.js +1 -0
- package/dist/esm/i18n/ja.js +2 -1
- package/dist/esm/i18n/ko.js +1 -0
- package/dist/esm/i18n/nb.js +1 -0
- package/dist/esm/i18n/nl.js +1 -0
- package/dist/esm/i18n/pl.js +1 -0
- package/dist/esm/i18n/pt_BR.js +1 -0
- package/dist/esm/i18n/ru.js +1 -0
- package/dist/esm/i18n/sv.js +1 -0
- package/dist/esm/i18n/th.js +1 -0
- package/dist/esm/i18n/tr.js +1 -0
- package/dist/esm/i18n/uk.js +1 -0
- package/dist/esm/i18n/vi.js +1 -0
- package/dist/esm/i18n/zh.js +1 -0
- package/dist/esm/i18n/zh_TW.js +1 -0
- package/dist/esm/imageMetaData/index.js +83 -89
- package/dist/esm/imageMetaData/metatags.js +35 -37
- package/dist/esm/imageMetaData/parseJPEG.js +33 -35
- package/dist/esm/imageMetaData/parsePNG.js +82 -86
- package/dist/esm/imageMetaData/types.js +6 -6
- package/dist/esm/util.js +42 -46
- package/dist/esm/version.json +1 -1
- package/dist/types/i18n/en_GB.d.ts +1 -1
- package/package.json +20 -20
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @atlaskit/media-ui
|
|
2
2
|
|
|
3
|
+
## 22.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`56507598609`](https://bitbucket.org/atlassian/atlassian-frontend/commits/56507598609) - Skip minor dependency bump
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
13
|
+
## 22.3.6
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [`2e01c9c74b5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2e01c9c74b5) - DUMMY remove before merging to master; dupe adf-schema via adf-utils
|
|
18
|
+
|
|
3
19
|
## 22.3.5
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
package/dist/cjs/MediaButton.js
CHANGED
|
@@ -13,6 +13,9 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
13
13
|
var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
|
|
14
14
|
var _excluded = ["appearance", "buttonRef"],
|
|
15
15
|
_excluded2 = ["buttonStyles"];
|
|
16
|
+
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
17
|
+
// Keep Media buttons to use static colors from the new color palette to support the hybrid
|
|
18
|
+
// theming in media viewer https://product-fabric.atlassian.net/browse/DSP-6067
|
|
16
19
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
17
20
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
18
21
|
var buttonTheme = {
|
|
@@ -45,6 +45,7 @@ var Frame = /*#__PURE__*/function (_React$Component) {
|
|
|
45
45
|
onClick(event);
|
|
46
46
|
}
|
|
47
47
|
});
|
|
48
|
+
// prevent default on mousedown to avoid inline card losing focus
|
|
48
49
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMouseDown", function (e) {
|
|
49
50
|
e.preventDefault();
|
|
50
51
|
});
|
|
@@ -48,9 +48,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
48
48
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
49
49
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
50
50
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
51
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
51
|
+
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */ // Keep media player components used in media-viewer to use static colors from the new color palette to
|
|
52
|
+
// support the hybrid theming in media viewer https://product-fabric.atlassian.net/browse/DSP-6067
|
|
52
53
|
var packageName = "@atlaskit/media-ui";
|
|
53
|
-
var packageVersion = "22.
|
|
54
|
+
var packageVersion = "22.4.0";
|
|
54
55
|
var MEDIUM_VIDEO_MAX_WIDTH = 400;
|
|
55
56
|
var SMALL_VIDEO_MAX_WIDTH = 160;
|
|
56
57
|
var MINIMUM_DURATION_BEFORE_SAVING_TIME = 60;
|
|
@@ -26,7 +26,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
26
26
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
27
27
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
28
28
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
29
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
29
|
+
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */ // Keep PlaybackSpeedControls to use static colors from the new color palette to support the hybrid
|
|
30
|
+
// theming in media viewer https://product-fabric.atlassian.net/browse/DSP-6067
|
|
30
31
|
var PlaybackSpeedControls = /*#__PURE__*/function (_Component) {
|
|
31
32
|
(0, _inherits2.default)(PlaybackSpeedControls, _Component);
|
|
32
33
|
var _super = _createSuper(PlaybackSpeedControls);
|
|
@@ -9,6 +9,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
|
|
|
9
9
|
var _styled = _interopRequireDefault(require("@emotion/styled"));
|
|
10
10
|
var _colors = require("@atlaskit/theme/colors");
|
|
11
11
|
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18;
|
|
12
|
+
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
12
13
|
var CustomVideoWrapper = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n height: 100%;\n user-select: none;\n"])));
|
|
13
14
|
exports.CustomVideoWrapper = CustomVideoWrapper;
|
|
14
15
|
var VideoWrapper = _styled.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n width: 100%;\n height: 100%;\n display: flex;\n flex-direction: column;\n"])));
|
package/dist/cjs/i18n/cs.js
CHANGED
package/dist/cjs/i18n/da.js
CHANGED
package/dist/cjs/i18n/de.js
CHANGED
package/dist/cjs/i18n/en.js
CHANGED
package/dist/cjs/i18n/en_GB.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
+
/* prettier-ignore */
|
|
7
8
|
/**
|
|
8
9
|
* NOTE:
|
|
9
10
|
*
|
|
@@ -22,7 +23,7 @@ var _default = {
|
|
|
22
23
|
'fabric.media.annotate.tool.arrow': 'Arrow',
|
|
23
24
|
'fabric.media.annotate.tool.blur': 'Blur',
|
|
24
25
|
'fabric.media.annotate.tool.brush': 'Brush',
|
|
25
|
-
'fabric.media.annotate.tool.
|
|
26
|
+
'fabric.media.annotate.tool.color': 'Colour',
|
|
26
27
|
'fabric.media.annotate.tool.line.thickness': 'Line thickness',
|
|
27
28
|
'fabric.media.annotate.tool.shape': 'Shape',
|
|
28
29
|
'fabric.media.annotate.tool.text': 'Text',
|
package/dist/cjs/i18n/es.js
CHANGED
package/dist/cjs/i18n/fi.js
CHANGED
package/dist/cjs/i18n/fr.js
CHANGED
package/dist/cjs/i18n/hu.js
CHANGED
package/dist/cjs/i18n/it.js
CHANGED
package/dist/cjs/i18n/ja.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
+
/* prettier-ignore */
|
|
7
8
|
/**
|
|
8
9
|
* NOTE:
|
|
9
10
|
*
|
|
@@ -51,7 +52,7 @@ var _default = {
|
|
|
51
52
|
'fabric.media.couldnt_load_file': 'ファイルを読み込めませんでした。',
|
|
52
53
|
'fabric.media.couldnt_load_link': '不明な理由によって、このリンクを読み込めませんでした。',
|
|
53
54
|
'fabric.media.creating_preview': 'プレビューを作成中...',
|
|
54
|
-
'fabric.media.default_avatars': '
|
|
55
|
+
'fabric.media.default_avatars': '既定のアバター',
|
|
55
56
|
'fabric.media.disable_fullscreen': '全画面表示を無効化',
|
|
56
57
|
'fabric.media.display_thumbnail': 'サムネイルを表示',
|
|
57
58
|
'fabric.media.document': 'ドキュメント',
|
package/dist/cjs/i18n/ko.js
CHANGED
package/dist/cjs/i18n/nb.js
CHANGED
package/dist/cjs/i18n/nl.js
CHANGED
package/dist/cjs/i18n/pl.js
CHANGED
package/dist/cjs/i18n/pt_BR.js
CHANGED
package/dist/cjs/i18n/ru.js
CHANGED
package/dist/cjs/i18n/sv.js
CHANGED
package/dist/cjs/i18n/th.js
CHANGED
package/dist/cjs/i18n/tr.js
CHANGED
package/dist/cjs/i18n/uk.js
CHANGED
package/dist/cjs/i18n/vi.js
CHANGED
package/dist/cjs/i18n/zh.js
CHANGED
package/dist/cjs/i18n/zh_TW.js
CHANGED
|
@@ -46,30 +46,28 @@ function _getImageInfo() {
|
|
|
46
46
|
_getImageInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(fileInfo) {
|
|
47
47
|
var metadata, width, height, tags, scaleFactor;
|
|
48
48
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
49
|
-
while (1) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
return _context.stop();
|
|
72
|
-
}
|
|
49
|
+
while (1) switch (_context.prev = _context.next) {
|
|
50
|
+
case 0:
|
|
51
|
+
_context.next = 2;
|
|
52
|
+
return readImageMetaData(fileInfo);
|
|
53
|
+
case 2:
|
|
54
|
+
metadata = _context.sent;
|
|
55
|
+
if (metadata) {
|
|
56
|
+
_context.next = 5;
|
|
57
|
+
break;
|
|
58
|
+
}
|
|
59
|
+
return _context.abrupt("return", null);
|
|
60
|
+
case 5:
|
|
61
|
+
width = metadata.width, height = metadata.height, tags = metadata.tags;
|
|
62
|
+
scaleFactor = getScaleFactor(fileInfo.file, tags);
|
|
63
|
+
return _context.abrupt("return", {
|
|
64
|
+
scaleFactor: scaleFactor,
|
|
65
|
+
width: width,
|
|
66
|
+
height: height
|
|
67
|
+
});
|
|
68
|
+
case 8:
|
|
69
|
+
case "end":
|
|
70
|
+
return _context.stop();
|
|
73
71
|
}
|
|
74
72
|
}, _callee);
|
|
75
73
|
}));
|
|
@@ -114,18 +112,16 @@ function _getOrientation() {
|
|
|
114
112
|
_getOrientation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(file) {
|
|
115
113
|
var tags;
|
|
116
114
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
117
|
-
while (1) {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
return _context2.stop();
|
|
128
|
-
}
|
|
115
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
116
|
+
case 0:
|
|
117
|
+
_context2.next = 2;
|
|
118
|
+
return (0, _metatags.readImageMetaTags)(file);
|
|
119
|
+
case 2:
|
|
120
|
+
tags = _context2.sent;
|
|
121
|
+
return _context2.abrupt("return", getOrientationFromTags(tags));
|
|
122
|
+
case 4:
|
|
123
|
+
case "end":
|
|
124
|
+
return _context2.stop();
|
|
129
125
|
}
|
|
130
126
|
}, _callee2);
|
|
131
127
|
}));
|
|
@@ -161,61 +157,59 @@ function _readImageMetaData() {
|
|
|
161
157
|
_readImageMetaData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(fileInfo) {
|
|
162
158
|
var file, src, type, width, height, tags, orientation, isImageRotated, data, img, _readImageNaturalOrie, _width, _height;
|
|
163
159
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
164
|
-
while (1) {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
if (!(isImageRotated || width === 0 && height === 0)) {
|
|
194
|
-
_context3.next = 27;
|
|
195
|
-
break;
|
|
196
|
-
}
|
|
197
|
-
_context3.prev = 13;
|
|
198
|
-
_context3.next = 16;
|
|
199
|
-
return (0, _util.loadImage)(src);
|
|
200
|
-
case 16:
|
|
201
|
-
img = _context3.sent;
|
|
202
|
-
_readImageNaturalOrie = (0, _util.readImageNaturalOrientationFromDOM)(img), _width = _readImageNaturalOrie.width, _height = _readImageNaturalOrie.height;
|
|
203
|
-
data.width = _width;
|
|
204
|
-
data.height = _height;
|
|
205
|
-
data.naturalWidth = img.naturalWidth;
|
|
206
|
-
data.naturalHeight = img.naturalHeight;
|
|
160
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
161
|
+
case 0:
|
|
162
|
+
file = fileInfo.file, src = fileInfo.src;
|
|
163
|
+
type = file.type;
|
|
164
|
+
width = 0;
|
|
165
|
+
height = 0;
|
|
166
|
+
_context3.next = 6;
|
|
167
|
+
return (0, _metatags.readImageMetaTags)(file);
|
|
168
|
+
case 6:
|
|
169
|
+
tags = _context3.sent;
|
|
170
|
+
// since we're reading metadata anyway, try to get dimensions from there...
|
|
171
|
+
if (tags && tags.PixelXDimension) {
|
|
172
|
+
width = getMetaTagNumericValue(tags, 'PixelXDimension', 0);
|
|
173
|
+
}
|
|
174
|
+
if (tags && tags.PixelXDimension) {
|
|
175
|
+
height = getMetaTagNumericValue(tags, 'PixelYDimension', 0);
|
|
176
|
+
}
|
|
177
|
+
// otherwise, load the image async (ideally avoid if found above due to being slightly expensive)
|
|
178
|
+
orientation = getOrientationFromTags(tags);
|
|
179
|
+
isImageRotated = (0, _imageOrientationUtil.isRotated)(orientation);
|
|
180
|
+
data = {
|
|
181
|
+
type: type,
|
|
182
|
+
width: width,
|
|
183
|
+
height: height,
|
|
184
|
+
naturalWidth: width,
|
|
185
|
+
naturalHeight: height,
|
|
186
|
+
tags: tags
|
|
187
|
+
};
|
|
188
|
+
if (!(isImageRotated || width === 0 && height === 0)) {
|
|
207
189
|
_context3.next = 27;
|
|
208
190
|
break;
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
191
|
+
}
|
|
192
|
+
_context3.prev = 13;
|
|
193
|
+
_context3.next = 16;
|
|
194
|
+
return (0, _util.loadImage)(src);
|
|
195
|
+
case 16:
|
|
196
|
+
img = _context3.sent;
|
|
197
|
+
_readImageNaturalOrie = (0, _util.readImageNaturalOrientationFromDOM)(img), _width = _readImageNaturalOrie.width, _height = _readImageNaturalOrie.height;
|
|
198
|
+
data.width = _width;
|
|
199
|
+
data.height = _height;
|
|
200
|
+
data.naturalWidth = img.naturalWidth;
|
|
201
|
+
data.naturalHeight = img.naturalHeight;
|
|
202
|
+
_context3.next = 27;
|
|
203
|
+
break;
|
|
204
|
+
case 24:
|
|
205
|
+
_context3.prev = 24;
|
|
206
|
+
_context3.t0 = _context3["catch"](13);
|
|
207
|
+
return _context3.abrupt("return", null);
|
|
208
|
+
case 27:
|
|
209
|
+
return _context3.abrupt("return", data);
|
|
210
|
+
case 28:
|
|
211
|
+
case "end":
|
|
212
|
+
return _context3.stop();
|
|
219
213
|
}
|
|
220
214
|
}, _callee3, null, [[13, 24]]);
|
|
221
215
|
}));
|
|
@@ -21,44 +21,42 @@ function _readImageMetaTags() {
|
|
|
21
21
|
_readImageMetaTags = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(file) {
|
|
22
22
|
var type, _yield$readPNGXMPMeta, iTXt, pHYs, xmpMetaData;
|
|
23
23
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
24
|
-
while (1) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
_context.next = 12;
|
|
31
|
-
break;
|
|
32
|
-
}
|
|
33
|
-
_context.next = 5;
|
|
34
|
-
return (0, _parsePNG.readPNGXMPMetaData)(file);
|
|
35
|
-
case 5:
|
|
36
|
-
_yield$readPNGXMPMeta = _context.sent;
|
|
37
|
-
iTXt = _yield$readPNGXMPMeta.iTXt;
|
|
38
|
-
pHYs = _yield$readPNGXMPMeta.pHYs;
|
|
39
|
-
xmpMetaData = _objectSpread(_objectSpread({}, (0, _parsePNGXMP.parseXMPMetaData)(iTXt)), pHYs);
|
|
40
|
-
return _context.abrupt("return", xmpMetaData);
|
|
41
|
-
case 12:
|
|
42
|
-
if (!(file.type === _types.ImageType.JPEG)) {
|
|
43
|
-
_context.next = 16;
|
|
44
|
-
break;
|
|
45
|
-
}
|
|
46
|
-
_context.next = 15;
|
|
47
|
-
return (0, _parseJPEG.readJPEGExifMetaData)(file);
|
|
48
|
-
case 15:
|
|
49
|
-
return _context.abrupt("return", _context.sent);
|
|
50
|
-
case 16:
|
|
51
|
-
_context.next = 20;
|
|
24
|
+
while (1) switch (_context.prev = _context.next) {
|
|
25
|
+
case 0:
|
|
26
|
+
type = file.type;
|
|
27
|
+
_context.prev = 1;
|
|
28
|
+
if (!(type === _types.ImageType.PNG)) {
|
|
29
|
+
_context.next = 12;
|
|
52
30
|
break;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
31
|
+
}
|
|
32
|
+
_context.next = 5;
|
|
33
|
+
return (0, _parsePNG.readPNGXMPMetaData)(file);
|
|
34
|
+
case 5:
|
|
35
|
+
_yield$readPNGXMPMeta = _context.sent;
|
|
36
|
+
iTXt = _yield$readPNGXMPMeta.iTXt;
|
|
37
|
+
pHYs = _yield$readPNGXMPMeta.pHYs;
|
|
38
|
+
xmpMetaData = _objectSpread(_objectSpread({}, (0, _parsePNGXMP.parseXMPMetaData)(iTXt)), pHYs);
|
|
39
|
+
return _context.abrupt("return", xmpMetaData);
|
|
40
|
+
case 12:
|
|
41
|
+
if (!(file.type === _types.ImageType.JPEG)) {
|
|
42
|
+
_context.next = 16;
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
45
|
+
_context.next = 15;
|
|
46
|
+
return (0, _parseJPEG.readJPEGExifMetaData)(file);
|
|
47
|
+
case 15:
|
|
48
|
+
return _context.abrupt("return", _context.sent);
|
|
49
|
+
case 16:
|
|
50
|
+
_context.next = 20;
|
|
51
|
+
break;
|
|
52
|
+
case 18:
|
|
53
|
+
_context.prev = 18;
|
|
54
|
+
_context.t0 = _context["catch"](1);
|
|
55
|
+
case 20:
|
|
56
|
+
return _context.abrupt("return", null);
|
|
57
|
+
case 21:
|
|
58
|
+
case "end":
|
|
59
|
+
return _context.stop();
|
|
62
60
|
}
|
|
63
61
|
}, _callee, null, [[1, 18]]);
|
|
64
62
|
}));
|