From 37e4b690a6a9745fd181446ada40279f4e10b87c Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 29 May 2017 15:46:25 +0200
Subject: [PATCH] touch interface params moved to minerva.create
---
frontend-js/src/main/js/minerva.js | 13 ++++++++++++-
frontend-js/src/test/js/minerva-test.js | 1 +
frontend-js/src/test/js/mocha-config.js | 5 ++++-
web/src/main/webapp/index.xhtml | 4 ----
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 0f5021796e..65053b96f2 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -232,8 +232,19 @@ function getProject(params) {
}
};
-function create(params) {
+function modifyParamsForTouchInterface(params) {
+ if (params.markerOptimization === undefined && params.bigLogo === undefined
+ && params.customTouchInterface === undefined) {
+ var windowsTouchInterface = ((navigator.appVersion.indexOf("Win") != -1) && ('ontouchstart' in document.documentElement));
+ params.markerOptimization = !windowsTouchInterface;
+ params.bigLogo = windowsTouchInterface;
+ params.customTouchInterface = windowsTouchInterface;
+ }
+ return params;
+}
+function create(params) {
+ params = modifyParamsForTouchInterface(params);
var customMap;
var leftPanel;
var topMenu;
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index d5bc556c8b..4840d61cef 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -230,6 +230,7 @@ describe('minerva global', function() {
projectId : "sample",
element : testDiv
};
+ logger.debug(options);
return minerva.create(options).then(function(result) {
assert.ok(result);
});
diff --git a/frontend-js/src/test/js/mocha-config.js b/frontend-js/src/test/js/mocha-config.js
index 2141c28dff..9267f89710 100644
--- a/frontend-js/src/test/js/mocha-config.js
+++ b/frontend-js/src/test/js/mocha-config.js
@@ -7,7 +7,10 @@ var Helper = require('./Helper');
// GLOBAL configuration
global.navigator = {
- userAgent : 'node.js'
+ userAgent : 'node.js',
+ appName : 'MinervaUnitTest',
+ appVersion : '0.0.1',
+
};
var jsdom = require('jsdom');
diff --git a/web/src/main/webapp/index.xhtml b/web/src/main/webapp/index.xhtml
index 260cd314c5..009ee0edd0 100644
--- a/web/src/main/webapp/index.xhtml
+++ b/web/src/main/webapp/index.xhtml
@@ -33,12 +33,8 @@
function initMap(){
var element = document.getElementById('minervaAppDiv');
- var windowsTouchInterface = ((navigator.appVersion.indexOf("Win")!=-1) && ('ontouchstart' in document.documentElement));
return minerva.create({
element : element,
- markerOptimization : !windowsTouchInterface,
- bigLogo : windowsTouchInterface,
- customTouchInterface: windowsTouchInterface,
}).then(function(result){
customMap = result;
document.title = result.getProject().getName();
--
GitLab