vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-23 11:53:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2015-11-01 21:48:58 -03:00
commit 33c3da51c8
6 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mindplot/src/main/javascript/Designer.js
View File

@ -82,32 +82,14 @@ mindplot.Designer = new Class(/** @lends Designer */{
* @private
*/
_registerWheelEvents: function () {
var workspace = this._workspace;
var zoomFactor = 1.006;
var me = this;
// Zoom In and Zoom Out must active event
$(document).on('mousewheel', function (event) {
// Change mousewheel handling so we let the default
// event happen if we are outside the container. -> FIXME: it still happening?
/*var coords = screenManager.getContainer().getCoordinates();
var isOutsideContainer = event.client.y < coords.top ||
event.client.y > coords.bottom ||
event.client.x < coords.left ||
event.client.x > coords.right;
if (!isOutsideContainer) {
if (event.wheel > 0) {
this.zoomIn(1.05);
}
else {
this.zoomOut(1.05);
}
event.preventDefault();
}*/
if (event.deltaY > 0) {
me.zoomIn(1.05);
}
else {
me.zoomOut(1.05);
me.zoomIn(zoomFactor);
} else {
me.zoomOut(zoomFactor);
}
event.preventDefault();
});

1
wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java
View File

@ -48,6 +48,7 @@ public class SupportedUserAgent implements Serializable {
boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
result = result || browser == Browser.FIREFOX4 && majorVersion >= 40;
result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
result = result || browser == Browser.IE && majorVersion >= 8;
result = result || browser == Browser.OPERA10 && majorVersion >= 11;

2
wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
View File

@ -72,7 +72,7 @@ public class AdminController extends BaseController {
}
@ApiOperation("Note: Administration permissions required.")
@RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email}", produces = {"application/json", "application/xml"})
@RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email:.+}", produces = {"application/json", "application/xml"})
@ResponseBody
public RestUser getUserByEmail(@PathVariable String email) throws IOException {
final User user = userService.getUserBy(email);

1
wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
View File

@ -51,6 +51,7 @@ public class RestUser {
public RestUser(@NotNull User user) {
this.user = user;
this.password = user.getPassword();
}
public Calendar getCreationDate() {

8
wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
View File

@ -58,14 +58,6 @@
var persistence = mindplot.PersistenceManager.getInstance();
var mindmap = mindmap = persistence.load(mapId);
designer.loadMap(mindmap);
$('zoomIn').addEvent('click', function () {
designer.zoomIn();
});
$('zoomOut').addEvent('click', function () {
designer.zoomOut();
});
});
</script>
</head>

8
wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
View File

@ -90,14 +90,6 @@
var persistence = mindplot.PersistenceManager.getInstance();
var mindmap = mindmap = persistence.load(mapId);
designer.loadMap(mindmap);
$('zoomIn').addEvent('click', function () {
designer.zoomIn();
});
$('zoomOut').addEvent('click', function () {
designer.zoomOut();
});
});
</script>
</head>