diff --git a/web2d/src/test/javascript/render/arrow.html b/web2d/src/test/javascript/render/arrow.html index 666ca424..59fbe720 100644 --- a/web2d/src/test/javascript/render/arrow.html +++ b/web2d/src/test/javascript/render/arrow.html @@ -19,9 +19,8 @@ web2d.peer.utils = {}; - + - diff --git a/web2d/src/test/javascript/render/curvedLine.html b/web2d/src/test/javascript/render/curvedLine.html index 46739672..abdaf6b8 100644 --- a/web2d/src/test/javascript/render/curvedLine.html +++ b/web2d/src/test/javascript/render/curvedLine.html @@ -19,9 +19,7 @@ web2d.peer.utils = {}; - - - + diff --git a/web2d/src/test/javascript/render/events.html b/web2d/src/test/javascript/render/events.html index 76fcdb95..294dac3e 100755 --- a/web2d/src/test/javascript/render/events.html +++ b/web2d/src/test/javascript/render/events.html @@ -15,9 +15,8 @@ web2d.peer.utils = {}; - + - diff --git a/web2d/src/test/javascript/render/group.html b/web2d/src/test/javascript/render/group.html index e788b656..4398be44 100755 --- a/web2d/src/test/javascript/render/group.html +++ b/web2d/src/test/javascript/render/group.html @@ -15,9 +15,8 @@ web2d.peer.utils = {}; - + - diff --git a/web2d/src/test/javascript/render/line.html b/web2d/src/test/javascript/render/line.html index fe86785e..13bd3a28 100755 --- a/web2d/src/test/javascript/render/line.html +++ b/web2d/src/test/javascript/render/line.html @@ -15,9 +15,9 @@ web2d.peer.utils = {}; - + - @@ -45,7 +45,7 @@ - + - diff --git a/web2d/src/test/javascript/render/prototype.html b/web2d/src/test/javascript/render/prototype.html index a9dda573..a7e03ebf 100755 --- a/web2d/src/test/javascript/render/prototype.html +++ b/web2d/src/test/javascript/render/prototype.html @@ -15,9 +15,9 @@ web2d.peer.utils = {}; - + - @@ -46,9 +46,9 @@ + var pos = shadowGroup.getPosition(); + nodeGroup.setPosition(pos.x, pos.y); + nodeGroup._drag = false; + outerRect.setVisibility(true); + workspace.removeEvent("mousemove", workspace._moveFunction); + workspace.removeEvent("mouseup", mouseUp); + + }; + workspace.addEvent("mouseup", mouseUp); + + }); + + } + diff --git a/web2d/src/test/javascript/render/rect.html b/web2d/src/test/javascript/render/rect.html index 4c9f9c51..b9809763 100755 --- a/web2d/src/test/javascript/render/rect.html +++ b/web2d/src/test/javascript/render/rect.html @@ -16,9 +16,9 @@ web2d.peer.utils = {}; - + - @@ -46,11 +46,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

PolyLines Render Tests

- - -- - - - - - - - - - - - - -
- Different types of PolyLines that can be used. - -
-
- This is how multiple childs will look in each style line - -
-
- - diff --git a/web2d/src/test/javascript/render/shapes.html b/web2d/src/test/javascript/render/shapes.html index c42187ff..f13cd191 100755 --- a/web2d/src/test/javascript/render/shapes.html +++ b/web2d/src/test/javascript/render/shapes.html @@ -15,9 +15,8 @@ web2d.peer.utils = {}; - + - diff --git a/web2d/src/test/javascript/render/text.html b/web2d/src/test/javascript/render/text.html index 74e499de..93bc58af 100755 --- a/web2d/src/test/javascript/render/text.html +++ b/web2d/src/test/javascript/render/text.html @@ -15,9 +15,8 @@ web2d.peer.utils = {}; - + - diff --git a/web2d/src/test/javascript/render/web2dLibraryLoader.js b/web2d/src/test/javascript/render/web2dLibraryLoader.js deleted file mode 100644 index 90640231..00000000 --- a/web2d/src/test/javascript/render/web2dLibraryLoader.js +++ /dev/null @@ -1,171 +0,0 @@ -/* -* Copyright [2011] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -// Modulue initializer. -web2d = { - peer: {} -}; - -web2d.peer = -{ - svg: {} -}; - -web2d.peer.utils = {}; -web2d.Loader = -{ - load: function(scriptPath, stylePath, jsFileName, callbackFn) - { - var headElement = document.getElementsByTagName('head'); - var htmlDoc = headElement.item(0); - var baseUrl = this.baseUrl(jsFileName); - this.files = scriptPath; - this.callbackFn = callbackFn; - - if (scriptPath && scriptPath.length > 0) - { - for (var i = 0; i < scriptPath.length; i++) - { - var file = scriptPath[i]; - this.includeScriptNode(baseUrl + file); - } - } - }, - baseUrl: function(jsFileName) - { - var headElement = document.getElementsByTagName('head'); - var htmlDoc = headElement.item(0); - var headChildren = htmlDoc.childNodes; - var result = null; - for (var i = 0; i < headChildren.length; i++) - { - var node = headChildren.item(i); - if (node.nodeName && node.nodeName.toLowerCase() == "script") - { - var libraryUrl = node.src; - if (libraryUrl.indexOf(jsFileName) != -1) - { - var index = libraryUrl.lastIndexOf("/"); - index = libraryUrl.lastIndexOf("/", index - 1); - result = libraryUrl.substring(0, index); - } - } - } - - if (result == null) - { - throw "Could not obtain the base url directory."; - } - return result; - }, - includeScriptNode: function(filename) { - var html_doc = document.getElementsByTagName('head').item(0); - var js = document.createElement('script'); - js.setAttribute('language', 'javascript'); - js.setAttribute('type', 'text/javascript'); - js.setAttribute('src', filename); - - function calltheCBcmn() { - web2d.Loader.checkLoaded(filename); - } - - if(typeof(js.addEvent) != 'undefined') { - /* The FF, Chrome, Safari, Opera way */ - js.addEvent('load',calltheCBcmn,false); - } - else { - /* The MS IE 8+ way (may work with others - I dunno)*/ - var ret = js.onreadystatechange= function handleIeState() { - if(js.readyState == 'loaded' || js.readyState == 'complete'){ - calltheCBcmn(); - } - }; - } - - html_doc.appendChild(js); - return false; - }, - includeStyleNode: function(filename) { - var html_doc = document.getElementsByTagName('head').item(0); - var js = document.createElement('link'); - js.setAttribute('rel', 'stylesheet'); - js.setAttribute('type', 'text/css'); - js.setAttribute('href', filename); - html_doc.appendChild(js); - return false; - }, - checkLoaded:function(name) { - var index = -1; - for(var i = 0 ; i - + -