Merge branch 'develop' into feature/browser_export

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "wisemapping-font-end",
+    "name": "wisemapping-front-end",
     "scripts": {
         "bootstrap": "lerna bootstrap",
         "build": "lerna run build",

packages/mindplot/src/components/Designer.js

@@ -79,7 +79,7 @@ class Designer extends Events {
 
     // Init Screen manager..
     const screenManager = new ScreenManager(divElement);
-    this._workspace = new Workspace(screenManager, this._model.getZoom());
+    this._workspace = new Workspace(screenManager, this._model.getZoom(), !!options.readOnly);
 
     // Init layout manager ...
     this._eventBussDispatcher = new EventBusDispatcher(this.getModel());

packages/mindplot/src/components/Relationship.js

@@ -169,7 +169,11 @@ class Relationship extends ConnectionLine {
     workspace.append(this._controlPointsController);
 
     this._controlPointControllerListener = this._initializeControlPointController.bind(this);
+    if (workspace.isReadOnly) {
+      this._line2d.setCursor('default');
+    } else {
       this._line2d.addEvent('click', this._controlPointControllerListener);
+    }
     this._isInWorkspace = true;
 
     workspace.append(this._startArrow);
@@ -187,7 +191,9 @@ class Relationship extends ConnectionLine {
   removeFromWorkspace(workspace) {
     workspace.removeChild(this._focusShape);
     workspace.removeChild(this._controlPointsController);
+    if (!workspace.isReadOnly) {
       this._line2d.removeEvent('click', this._controlPointControllerListener);
+    }
     this._isInWorkspace = false;
     workspace.removeChild(this._startArrow);
     if (this._endArrow) workspace.removeChild(this._endArrow);

packages/mindplot/src/components/Workspace.js

@@ -19,13 +19,14 @@ import { $assert, $defined } from '@wisemapping/core-js';
 import { Workspace as Workspace2D, Toolkit } from '@wisemapping/web2d';
 
 class Workspace {
-  constructor(screenManager, zoom) {
+  constructor(screenManager, zoom, isReadOnly) {
     // Create a suitable container ...
     $assert(screenManager, 'Div container can not be null');
     $assert(zoom, 'zoom container can not be null');
 
     this._zoom = zoom;
     this._screenManager = screenManager;
+    this._isReadOnly = isReadOnly;
 
     const divContainer = screenManager.getContainer();
     this._screenWidth = parseInt(divContainer.css('width'), 10);
@@ -44,6 +45,10 @@ class Workspace {
     this._eventsEnabled = true;
   }
 
+  get isReadOnly() {
+    return this._isReadOnly;
+  }
+
   _createWorkspace() {
     // Initialize workspace ...
     const coordOriginX = -(this._screenWidth / 2);

packages/mindplot/src/components/widget/LinkIconTooltip.js

@@ -26,23 +26,30 @@ class LinkIconTooltip extends FloatingTip {
     const nativeElement = $(linkIcon.getImage().peer._native);
     super(nativeElement, {
       // Content can also be a function of the target element!
-      content: LinkIconTooltip._buildContent(linkIcon),
+      content() {
+        return LinkIconTooltip._buildContent(linkIcon);
+      },
       html: true,
       placement: 'bottom',
       container: 'body',
       title: $msg('LINK'),
       trigger: 'manual',
-      template: '<div id="linkPopover" class="popover" onmouseover="$(this).mouseleave(function() {$(this).fadeOut(200); });" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
+      template: '<div id="linkPopover" class="popover" onmouseover="jQuery(this).mouseleave(function() {jQuery(this).fadeOut(200); });" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
+      destroyOnExit: true,
     });
   }
 
   static _buildContent(linkIcon) {
+    const url = linkIcon.getModel().getUrl();
+    const linkText = `URL: ${url}`;
+    const linkPreview = `http://free.pagepeeker.com/v2/thumbs.php?size=m&url=${url}`;
+
     const result = $('<div></div>').css({
       padding: '5px',
       width: '100%',
     });
 
-    const text = $('<div></div>').text(`URL: ${linkIcon.getModel().getUrl()}`)
+    const text = $('<div id="linkPopoverUrl"></div>').text(linkText)
       .css({
         'white-space': 'pre-wrap',
         'word-wrap': 'break-word',
@@ -57,15 +64,15 @@ class LinkIconTooltip extends FloatingTip {
         'padding-top': '5px',
       });
 
-    const img = $('<img>')
+    const img = $('<img id="linkPopoverPreview">')
-      .prop('src', `http://free.pagepeeker.com/v2/thumbs.php?size=m&url=${linkIcon.getModel().getUrl()}`)
+      .prop('src', linkPreview)
-      .prop('img', linkIcon.getModel().getUrl())
+      .prop('img', url)
-      .prop('alt', linkIcon.getModel().getUrl());
+      .prop('alt', url);
 
     img.css('padding', '5px');
 
-    const link = $('<a></a>').attr({
+    const link = $('<a id="linkPopoverAnchor"></a>').attr({
-      href: linkIcon.getModel().getUrl(),
+      href: url,
       alt: 'Open in new window ...',
       target: '_blank',
     });

packages/web2d/src/components/peer/svg/ElementPeer.js

@@ -34,6 +34,9 @@ class ElementPeer {
     this._size = { width: 1, height: 1 };
     this._changeListeners = {};
     // http://support.adobe.com/devsup/devsup.nsf/docs/50493.htm
+
+    // __handlers stores handlers references so they can be removed afterwards
+    this.__handlers = new Map();
   }
 
   setChildren(children) {
@@ -95,12 +98,15 @@ class ElementPeer {
      * http://developer.mozilla.org/en/docs/addEvent
      */
   addEvent(type, listener) {
-    this._native.addEventListener(type, listener);
+    // wrap it so it can be ~backward compatible with jQuery.trigger
+    const wrappedListener = (e) => listener(e, e.detail);
+    this.__handlers.set(listener, wrappedListener);
+    this._native.addEventListener(type, wrappedListener);
   }
 
   trigger(type, event) {
     // TODO: check this for correctness and for real jQuery.trigger replacement
-    this._native.dispatchEvent(new CustomEvent(type, event));
+    this._native.dispatchEvent(new CustomEvent(type, { detail: event }));
   }
 
   // eslint-disable-next-line class-methods-use-this
@@ -109,7 +115,8 @@ class ElementPeer {
   }
 
   removeEvent(type, listener) {
-    this._native.removeEventListener(type, listener);
+    this._native.removeEventListener(type, this.__handlers.get(listener));
+    this.__handlers.delete(listener);
   }
 
   setSize(width, height) {

packages/webapp/cypress/README.md

@@ -1,6 +1,6 @@
 # Running tests with cypress. 
 
-For details on why we picked Cypress, check the following [PR](https://bitbucket.org/wisemapping/wisemapping-react/pull-requests/1)
+For details on why we picked Cypress, check the following [PR](https://bitbucket.org/wisemapping/wisemapping-frontend/pull-requests/1)
 
 Check the [Cypress docs](https://docs.cypress.io/guides/overview/why-cypress.html) for more information