From 65de7403d76b8896a3cc855a0073c897963265f4 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Fri, 17 Feb 2012 21:00:41 -0300 Subject: [PATCH] Fix Firefox issue that causes that the map is not centered. --- Compiling-and-running.md | 8 +-- web2d/src/main/javascript/Workspace.js | 2 +- wise-editor/src/main/webapp/css/editor.less | 80 ++------------------- wise-editor/src/main/webapp/js/editor.js | 54 +++++++------- 4 files changed, 40 insertions(+), 104 deletions(-) diff --git a/Compiling-and-running.md b/Compiling-and-running.md index fda2addb..74a25a5c 100644 --- a/Compiling-and-running.md +++ b/Compiling-and-running.md @@ -5,7 +5,7 @@ The following products must be installed: * Java Development Kit 6 or higher (http://java.sun.com/javase/downloads/index.jsp) - * Maven 2.2.1 or higher (http://maven.apache.org/) + * Maven 3.x or higher (http://maven.apache.org/) ## Compiling @@ -14,13 +14,14 @@ WiseMapping uses Maven as packaging and project management. The project is compo * core-js: Utilities JavaScript libraries * web2d: JavaScript 2D VML/SVG abstraction library used by the mind map editor * mindplot: JavaScript mind map designer core + * wise-editor: Mindmap Editor standalone distribution * wise-webapp: J2EE web application Full compilation of the project can be done executing within : -`mvn install` +`mvn package` -Once this command is execute, the file /wise-webapp/target/wisemapping.war will be generated. +Once this command is execute, the file /wise-webapp/target/wisemapping*.war will be generated. ## Testing The previously generated war can be deployed locally executing within the directory /wise-webapp the following command: @@ -30,5 +31,4 @@ The previously generated war can be deployed locally executing within the direct This will start the application on the URL: http://localhost:8080/wise-webapp/. Additionally, a file based database is automatically populated with a test user. User: test@wisemapping.org - Password: test \ No newline at end of file diff --git a/web2d/src/main/javascript/Workspace.js b/web2d/src/main/javascript/Workspace.js index 8fe78d5c..158e1f5e 100644 --- a/web2d/src/main/javascript/Workspace.js +++ b/web2d/src/main/javascript/Workspace.js @@ -66,7 +66,7 @@ web2d.Workspace = new Class({ _createDivContainer : function(domElement) { var container = window.document.createElement("div"); container.id = "workspaceContainer"; - container.style.overflow = "hidden"; +// container.style.overflow = "hidden"; container.style.position = "relative"; container.style.top = "0px"; container.style.left = "0px"; diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index 17ce1982..5cff02f5 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -1,91 +1,21 @@ @import "compatibility.less"; @import "../css/libraries/moodialog/css/MooDialog.css"; - -/**********************************************************/ -/* Error Dialog ... */ -/**********************************************************/ - -#waitDialog { - position: absolute; - top: 10px; - left: 10px; - height: 200px; -} - -#waitingContainer, #errorContainer { - position: relative; - top: 80px; - height: 120px; /*background: whitesmoke;*/ - background: #FEFEFE; - opacity: .99; - padding: 15px; - width: 100%; - border: 1px solid; - border-color: #a9a9a9; - -} - -#errorContainer { - width: 400px; - border: 1px solid red; -} - -#waitingContainer .loadingText { - position: relative; - top: 50%; - margin-top: -35px; - font-size: 30px; - font-weight: bold; - vertical-align: text-bottom; - height: 30px; - float: left; -} - -#errorContainer .loadingText { - position: relative; - top: 50%; - margin-top: -80px; - font-size: 15px; - font-weight: bold; - vertical-align: text-bottom; - height: 30px; - float: right; - padding-left: 120px; -} - -#waitingContainer .loadingIcon { - position: relative; - background: url(../images/rebota.gif) no-repeat; - top: 50%; - margin-top: -65px; - height: 100px; - width: 121px; - float: left; - clear: both; -} - -#errorContainer .loadingIcon { - position: relative; - background: url(../images/errorIcon.png) no-repeat; - top: 50%; - margin-top: -65px; - height: 100px; - width: 121px; - float: left; - clear: both; -} - /********************************************************************************/ /* Header & Toolbar Styles */ /********************************************************************************/ @import "header.less"; +body { + overflow:hidden; +} + div#mindplot { position: relative; top: 0; left: 0; width: 100%; + height:100%; border: 0; } diff --git a/wise-editor/src/main/webapp/js/editor.js b/wise-editor/src/main/webapp/js/editor.js index 5b17f47d..94f361f3 100644 --- a/wise-editor/src/main/webapp/js/editor.js +++ b/wise-editor/src/main/webapp/js/editor.js @@ -90,6 +90,7 @@ function loadDesignerOptions(jsonConf) { }; result = {readOnly:false,zoom:0.85,saveOnLoad:true,size:containerSize,viewPort:viewPort,container:'mindplot'}; } + console.log("result:" + JSON.encode(result)); return result; } @@ -161,32 +162,37 @@ editor.WaitDialog = new Class({ }); editor.Help = { - buildHelp:function(panel){ + buildHelp:function(panel) { var container = new Element('div'); container.setStyles({width:'100%', textAlign:'center'}); - var content1 = Help.buildContentIcon('../images/black-keyboard.png', 'Keyboard Shortcuts', function(){MOOdalBox.open('keyboard.htm','KeyBoard Shortcuts', '500px 400px', false);panel.hidePanel();}); - var content2 = Help.buildContentIcon('../images/firstSteps.png', 'Editor First Steps', function(){ - var wOpen; - var sOptions; + var content1 = Help.buildContentIcon('../images/black-keyboard.png', 'Keyboard Shortcuts', function() { + MOOdalBox.open('keyboard.htm', 'KeyBoard Shortcuts', '500px 400px', false); + panel.hidePanel(); + }); + var content2 = Help.buildContentIcon('../images/firstSteps.png', 'Editor First Steps', function() { + var wOpen; + var sOptions; - sOptions = 'status=yes,menubar=yes,scrollbars=yes,resizable=yes,toolbar=yes'; - sOptions = sOptions + ',width=' + (screen.availWidth - 10).toString(); - sOptions = sOptions + ',height=' + (screen.availHeight - 122).toString(); - sOptions = sOptions + ',screenX=0,screenY=0,left=0,top=0'; + sOptions = 'status=yes,menubar=yes,scrollbars=yes,resizable=yes,toolbar=yes'; + sOptions = sOptions + ',width=' + (screen.availWidth - 10).toString(); + sOptions = sOptions + ',height=' + (screen.availHeight - 122).toString(); + sOptions = sOptions + ',screenX=0,screenY=0,left=0,top=0'; - wOpen = window.open("firststeps.htm", "WiseMapping", "width=100px, height=100px"); - wOpen.focus(); - wOpen.moveTo( 0, 0 ); - wOpen.resizeTo( screen.availWidth, screen.availHeight ); - panel.hidePanel(); + wOpen = window.open("firststeps.htm", "WiseMapping", "width=100px, height=100px"); + wOpen.focus(); + wOpen.moveTo(0, 0); + wOpen.resizeTo(screen.availWidth, screen.availHeight); + panel.hidePanel(); }); - container.addEvent('show', function(){ - content1.effect('opacity',{duration:800}).start(0,100); - var eff = function(){content2.effect('opacity',{duration:800}).start(0,100);}; + container.addEvent('show', function() { + content1.effect('opacity', {duration:800}).start(0, 100); + var eff = function() { + content2.effect('opacity', {duration:800}).start(0, 100); + }; eff.delay(150); }); - container.addEvent('hide', function(){ + container.addEvent('hide', function() { content1.effect('opacity').set(0); content2.effect('opacity').set(0) }); @@ -194,25 +200,25 @@ editor.Help = { content2.inject(container); return container; }, - buildContentIcon:function(image, text, onClickFn){ + buildContentIcon:function(image, text, onClickFn) { var container = new Element('div').setStyles({margin:'15px 0px 0px 0px', opacity:0, padding:'5px 0px', border: '1px solid transparent', cursor:'pointer'}); var icon = new Element('div'); - icon.addEvent('click',onClickFn); + icon.addEvent('click', onClickFn); var img = new Element('img'); - img.setProperty('src',image); + img.setProperty('src', image); img.inject(icon); icon.inject(container); var textContainer = new Element('div').setStyles({width:'100%', color:'white'}); - textContainer.innerHTML=text; + textContainer.innerHTML = text; textContainer.inject(container); - container.addEvent('mouseover', function(event){ + container.addEvent('mouseover', function() { $(this).setStyle('border-top', '1px solid #BBB4D6'); $(this).setStyle('border-bottom', '1px solid #BBB4D6'); }.bindWithEvent(container)); - container.addEvent('mouseout', function(event){ + container.addEvent('mouseout', function() { $(this).setStyle('border-top', '1px solid transparent'); $(this).setStyle('border-bottom', '1px solid transparent');