ep_sketchspace - npm Package Compare versions

Comparing version 0.0.7 to 0.0.8

package.json

 {
   "name": "ep_sketchspace",
   "description": "Drawing and image annotation",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "author": "RedHog (Egil Moeller) <[e-mail]>",
@@ -6,0 +6,0 @@ "contributors": [],

static/js/sketchSpaceDesigner/designer/ui.js

@@ -16,3 +16,3 @@ (function () {
     widgetsInTemplate: true,
-    templateString: '<span>' +
+    templateString: '<ul>' +
                     '  <li id="addEllipse" dojoAttachEvent="onclick:_onAddEllipse">' +
@@ -33,26 +33,26 @@ '    <a title="Add ellipse"><span class="buttonicon buttonicon-addellipse"></span></a>' +
                     '  </li>' +
-                    '</span>',
+                    '</ul>',
     _onAddEllipse: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.AddEllipse());
-      this.selectToolIcon("addEllipse");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.AddEllipse());
+      this.ui.selectToolIcon("addEllipse");
     },
 
     _onAddPath: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.AddPath());
-      this.selectToolIcon("addPath");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.AddPath());
+      this.ui.selectToolIcon("addPath");
     },
 
     _onAddPathFreehand: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.AddPathFreehand());
-      this.selectToolIcon("addPathFreehand");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.AddPathFreehand());
+      this.ui.selectToolIcon("addPathFreehand");
     },
 
     _onAddPathPolyline: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.AddPathPolyline());
-      this.selectToolIcon("addPathPolyline");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.AddPathPolyline());
+      this.ui.selectToolIcon("addPathPolyline");
     },
 
     _onAddRect: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.AddRect());
-      this.selectToolIcon("addRect");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.AddRect());
+      this.ui.selectToolIcon("addRect");
     }
@@ -63,10 +63,10 @@ });
     widgetsInTemplate: true,
-    templateString: '<span>' +
+    templateString: '<ul>' +
                     '  <li id="select" dojoAttachEvent="onclick:_onSelect">' +
                     '    <a title="Select objects"><span class="buttonicon buttonicon-select"></span></a>' +
                     '  </li>' +
-                    '</span>',
+                    '</ul>',
     _onSelect: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.Select());
-      this.selectToolIcon("select");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.Select());
+      this.ui.selectToolIcon("select");
     },
@@ -77,3 +77,3 @@ });
     widgetsInTemplate: true,
-    templateString: '<span>' +
+    templateString: '<ul>' +
                     '  <li id="pan" dojoAttachEvent="onclick:_onPan">' +
@@ -91,20 +91,20 @@ '    <a title="Pan"><span class="buttonicon buttonicon-pan"></span></a>' +
                     '  </li>' +
-                    '</span>',
+                    '</ul>',
     _onZoomIn: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.ZoomPlus(true));
-      this.selectToolIcon("zoomIn");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.ZoomPlus(true));
+      this.ui.selectToolIcon("zoomIn");
     },
 
     _onZoomDefault: function() {
-      this.editor.surface_transform.setTransform(dojox.gfx.matrix.identity);
+      this.ui.editor.surface_transform.setTransform(dojox.gfx.matrix.identity);
     },
 
     _onZoomOut: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.ZoomPlus(false));
-      this.selectToolIcon("zoomOut");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.ZoomPlus(false));
+      this.ui.selectToolIcon("zoomOut");
     },
 
     _onPan: function() {
-      this.editor.setMode(new sketchSpaceDesigner.designer.modes.PanPlus(false));
-      this.selectToolIcon("pan");
+      this.ui.editor.setMode(new sketchSpaceDesigner.designer.modes.PanPlus(false));
+      this.ui.selectToolIcon("pan");
     }
@@ -118,9 +118,9 @@
                     '    <div class="toolbar enabledtoolbar">' +
-                    '      <ul class="menu_left">' +
-                    '        <div id="addTools" dojoType="sketchSpaceDesigner.designer.widgets.ListContainer" dojoAttachPoint="addTools"></div>' +
-                    '        <li class="separator"></li>' +
-                    '        <div id="selectTools" dojoType="sketchSpaceDesigner.designer.widgets.ListContainer" dojoAttachPoint="selectTools"></div>' +
-                    '        <li class="separator"></li>' +
-                    '        <div id="navigationTools" dojoType="sketchSpaceDesigner.designer.widgets.ListContainer" dojoAttachPoint="navigationTools"></div>' +
-                    '      </ul>' +
+                    '      <div class="menu_left">' +
+                    '        <span id="addTools" dojoType="sketchSpaceDesigner.designer.widgets.ListContainer" dojoAttachPoint="addTools"></span>' +
+                    '        <span class="separator"></span>' +
+                    '        <span id="selectTools" dojoType="sketchSpaceDesigner.designer.widgets.ListContainer" dojoAttachPoint="selectTools"></span>' +
+                    '        <span class="separator"></span>' +
+                    '        <span id="navigationTools" dojoType="sketchSpaceDesigner.designer.widgets.ListContainer" dojoAttachPoint="navigationTools"></span>' +
+                    '      </div>' +
                     '      <ul class="menu_right">' +
@@ -147,6 +147,6 @@ '        <li id="syncView">' +
 
-      this.addTools.addChild(new sketchSpaceDesigner.designer.DesignerUIMenuAddTools());
-      this.selectTools.addChild(new sketchSpaceDesigner.designer.DesignerUIMenuSelectTools());
-      this.navigationTools.addChild(new sketchSpaceDesigner.designer.DesignerUIMenuNavigationTools());
-      hooks.callAll("sketchSpaceDesigner_designer_DesignerUI_startup", {widget:this, arguments:arguments});
+      this.addTools.addChild(new sketchSpaceDesigner.designer.DesignerUIMenuAddTools({ui:this}));
+      this.selectTools.addChild(new sketchSpaceDesigner.designer.DesignerUIMenuSelectTools({ui:this}));
+      this.navigationTools.addChild(new sketchSpaceDesigner.designer.DesignerUIMenuNavigationTools({ui:this}));
+      hooks.callAll("sketchSpaceDesigner_designer_DesignerUI_startup", {ui:this, arguments:arguments});
 
@@ -153,0 +153,0 @@ this.editor = new sketchSpaceDesigner.designer.editor.Editor(this.editorArea, this.attr("userId"), this, typeof(pad) == "undefined");

static/js/sketchSpaceDesigner/designer/widgets.js

@@ -147,3 +147,3 @@ dojo.provide("sketchSpaceDesigner.designer.widgets");
 
-        wrapperClass: "listContainer",
+        baseClass: "listContainer",
         separatorClass: "listContainer-separator",
@@ -154,8 +154,4 @@ itemWrapperClass: "listContainer-option",
 
-        wrapper: function () {
-	        this.wrapperContainer = dojo.create("div", {"class": this.wrapperClass}, this.domNode);
-        },
-
         separator: function () {
-	        dojo.create("span", {"class": this.separatorClass}, this.wrapperContainer);
+                this.domNode.appendChild(dojo.create("span", {"class": this.separatorClass}));
         },
@@ -166,3 +162,3 @@
                 if (title) {
-                        var labeled = dojo.create("span", {"class": this.itemWraperClass}, this.wrapperContainer);
+                        var labeled = dojo.create("span", {"class": this.itemWraperClass}, this.domNode);
                         var label = dojo.create("label", {"for": child.get("id"), "class":this.labelClass}, labeled);
@@ -172,3 +168,3 @@ label.innerHTML = child.get("label") || child.get("title");
                 } else {
-                        this.wrapperContainer.appendChild(this.wrapperContainer.domNode);
+                        this.domNode.appendChild(child.domNode);
                 }	        
@@ -180,7 +176,9 @@ dojo.addClass(child.domNode, this.childClass);
    	        var children = this.getChildren();
-            
-                var oldWrapperContainer = this.wrapperContainer;
-                this.wrapper();
-                
-		// Iterate over the children, adding them to the container.
+
+                // Remove child dom nodes
+		dojo.forEach(dojo.map(this.domNode.childNodes, function (x) { return x; }),  dojo.hitch(this, function(child, index){
+                        this.domNode.removeChild(child);
+		}));
+
+		// Iterate over the children, (re-)adding them to the container.
 		var first = true;
@@ -202,5 +200,2 @@ dojo.forEach(children, dojo.hitch(this, function(child, index){
 		});
-                if (oldWrapperContainer) {
-			oldWrapperContainer.parentNode.removeChild(oldWrapperContainer);
-		}
 
@@ -231,3 +226,3 @@ this.resize();
 dojo.declare("sketchSpaceDesigner.designer.widgets.OptionsContainer", [sketchSpaceDesigner.designer.widgets.ListContainer], {
-        wrapperClass: "optionsContainer",
+        baseClass: "optionsContainer",
         separatorClass: "optionsContainer-separator",
@@ -234,0 +229,0 @@ itemWrapperClass: "optionsContainer-option",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

127844

decreased by-0.07%

Lines of code

2831

decreased by-0.14%

No dependency changes