From e0a97d97f69b3432f0ea04ac15eba825b7cbff75 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Mon, 20 Nov 2017 10:25:21 +0100 Subject: [PATCH] plugin should use minervaDefine over define function to create plugin --- frontend-js/src/main/js/minerva.js | 2 +- frontend-js/src/main/js/plugin/Plugin.js | 2 +- frontend-js/testFiles/plugin-invalid/invalid_register.js | 2 +- frontend-js/testFiles/plugin-invalid/unclean-unregister.js | 2 +- frontend-js/testFiles/plugin/empty-without-function.js | 2 +- frontend-js/testFiles/plugin/empty.js | 2 +- frontend-js/testFiles/plugin/highlight-something.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index b2514003b6..c7b0a272bf 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -104,7 +104,7 @@ function createDivStructure(element) { var splitBar = functions.createElement({ type: "div", name: "minerva-plugin-split-bar", - style: "width:5px;height:100%;clear: both;display: table-cell;vertical-align:top", + style: "width:5px;height:100%;clear: both;display: table-cell;vertical-align:top;border-left:1px dotted gray;cursor:col-resize", content: " " }); element.appendChild(splitBar); diff --git a/frontend-js/src/main/js/plugin/Plugin.js b/frontend-js/src/main/js/plugin/Plugin.js index 960c24d716..b42b1fc16b 100644 --- a/frontend-js/src/main/js/plugin/Plugin.js +++ b/frontend-js/src/main/js/plugin/Plugin.js @@ -59,7 +59,7 @@ Plugin.prototype.load = function () { var error = false; try { // noinspection JSUnusedLocalSymbols - var define = function (pluginFunction) { + var minervaDefine = function (pluginFunction) { try { if (typeof pluginFunction === "function") { pluginData = pluginFunction(); diff --git a/frontend-js/testFiles/plugin-invalid/invalid_register.js b/frontend-js/testFiles/plugin-invalid/invalid_register.js index f8b555f8c9..607f1da2c3 100644 --- a/frontend-js/testFiles/plugin-invalid/invalid_register.js +++ b/frontend-js/testFiles/plugin-invalid/invalid_register.js @@ -1,4 +1,4 @@ -define(function () { +minervaDefine(function () { return { register: function (object) { throw new Error("Let's crash"); diff --git a/frontend-js/testFiles/plugin-invalid/unclean-unregister.js b/frontend-js/testFiles/plugin-invalid/unclean-unregister.js index a309c06a47..a7c00e2c55 100644 --- a/frontend-js/testFiles/plugin-invalid/unclean-unregister.js +++ b/frontend-js/testFiles/plugin-invalid/unclean-unregister.js @@ -1,4 +1,4 @@ -define(function () { +minervaDefine(function () { return { register: function (minervaObject) { options = { diff --git a/frontend-js/testFiles/plugin/empty-without-function.js b/frontend-js/testFiles/plugin/empty-without-function.js index bafb6d13a6..e0b51b2161 100644 --- a/frontend-js/testFiles/plugin/empty-without-function.js +++ b/frontend-js/testFiles/plugin/empty-without-function.js @@ -1,4 +1,4 @@ -define({ +minervaDefine({ register: function (object) { console.log("registering test plugin"); }, diff --git a/frontend-js/testFiles/plugin/empty.js b/frontend-js/testFiles/plugin/empty.js index a3fd24885e..a8e14229f3 100644 --- a/frontend-js/testFiles/plugin/empty.js +++ b/frontend-js/testFiles/plugin/empty.js @@ -1,4 +1,4 @@ -define(function () { +minervaDefine(function () { return { register: function (object) { console.log("registering test plugin"); diff --git a/frontend-js/testFiles/plugin/highlight-something.js b/frontend-js/testFiles/plugin/highlight-something.js index 985dec3860..be4c1edce0 100644 --- a/frontend-js/testFiles/plugin/highlight-something.js +++ b/frontend-js/testFiles/plugin/highlight-something.js @@ -1,4 +1,4 @@ -define(function () { +minervaDefine(function () { return { register: function (minervaObject) { minervaObject.element.innerHTML = "<div><button id='show'>highlight something</button></div>"; -- GitLab