From 1c9da7439d1d4664a91c0dd43162b47a2203b02c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Thu, 23 Aug 2018 12:36:28 +0200
Subject: [PATCH] Port photoviewer example to use a ES module for the script
code
... instead of the proprietary .pragma library syntax.
Change-Id: Ic5add04d6446a3c221eb3be6ec5a2240f0f80691
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
.../photoviewer/PhotoViewerCore/PhotoDelegate.qml | 2 +-
.../PhotoViewerCore/script/{script.js => script.mjs} | 10 ++++------
examples/demos/photoviewer/photoviewer.pro | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
rename examples/demos/photoviewer/PhotoViewerCore/script/{script.js => script.mjs} (94%)
diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index a4196dbd..b3652701 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -49,7 +49,7 @@
****************************************************************************/
import QtQuick 2.0
-import "script/script.js" as Script
+import "script/script.mjs" as Script
Package {
Item { id: stackItem; Package.name: 'stack'; width: 160; height: 153; z: stackItem.PathView.z }
diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.js b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
similarity index 94%
rename from examples/demos/photoviewer/PhotoViewerCore/script/script.js
rename to examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
index 0b3cae5f..1eb7cac7 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/script/script.js
+++ b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
@@ -48,22 +48,20 @@
**
****************************************************************************/
-.pragma library
-
-function getWidth(string) {
+export function getWidth(string) {
return (string.match(/width=\"([0-9]+)\"/))[1]
}
-function getHeight(string) {
+export function getHeight(string) {
return (string.match(/height=\"([0-9]+)\"/))[1]
}
-function getImagePath(string) {
+export function getImagePath(string) {
var pattern = /src=\"http:\/\/(\S+)\"/
return (string.match(pattern))[1]
}
-function calculateScale(width, height, cellSize) {
+export function calculateScale(width, height, cellSize) {
var widthScale = (cellSize * 1.0) / width
var heightScale = (cellSize * 1.0) / height
var scale = 0
diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro
index aa9bb82d..23431805 100644
--- a/examples/demos/photoviewer/photoviewer.pro
+++ b/examples/demos/photoviewer/photoviewer.pro
@@ -28,7 +28,7 @@ RESOURCES += main.qml \
PhotoViewerCore/images/box-shadow.png \
PhotoViewerCore/images/busy.png \
PhotoViewerCore/images/cardboard.png \
- PhotoViewerCore/script/script.js \
+ PhotoViewerCore/script/script.mjs \
target.path = $$[QT_INSTALL_EXAMPLES]/demos/photoviewer
--
GitLab