Merge remote-tracking branch 'origin/develop' into feature/remove_mootols

Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
This commit is contained in:
Ezequiel Bergamaschi
2014-09-26 23:24:41 -03:00
151 changed files with 10302 additions and 10359 deletions

View File

@@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -510,6 +510,11 @@ mindplot.Designer = new Class({
if(borderColor){
targetModel.setBorderColor(borderColor)
}
var backgroundColor = sourceModel.getBackgroundColor();
if(backgroundColor){
targetModel.setBackgroundColor(backgroundColor)
}
},
_createChildModel:function (topic, mousePos) {

View File

@@ -62,7 +62,7 @@ mindplot.widget.LinkIconTooltip = new Class({
});
var img = $('<img>')
.prop('src', 'http://immediatenet.com/t/m?Size=1024x768&URL=' + linkIcon.getModel().getUrl())
.prop('src', 'https://api.thumbalizr.com/?url=' + linkIcon.getModel().getUrl() + '&width=250')
.prop('img', linkIcon.getModel().getUrl())
.prop('alt', linkIcon.getModel().getUrl());