[Dojo-checkins] asaelh - r22637 - in dojox/trunk/drawing: tests ui
dojo-checkins-admin at dojotoolkit.org
dojo-checkins-admin at dojotoolkit.org
Sat Jul 31 00:14:28 EDT 2010
Author: asaelh
Date: Fri Jul 30 21:14:25 2010
New Revision: 22637
Modified:
dojox/trunk/drawing/tests/drawing.html
dojox/trunk/drawing/tests/test_drawing.html
dojox/trunk/drawing/tests/test_drawing_toolbar.html
dojox/trunk/drawing/tests/test_paths.html
dojox/trunk/drawing/ui/Toolbar.js
Log:
Fixes #11514 - fixed Toolbar not detecting orientation \!strict
Modified: dojox/trunk/drawing/tests/drawing.html
==============================================================================
--- dojox/trunk/drawing/tests/drawing.html (original)
+++ dojox/trunk/drawing/tests/drawing.html Fri Jul 30 21:14:25 2010
@@ -1,10 +1,11 @@
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
<head>
<title>Drawing Test</title>
- <link href="../resources/drawing.css" rel="stylesheet" />
- <link href="../resources/toolbar.css" rel="stylesheet" />
-
<style>
+ @import url("../../../dijit/themes/dijit.css");
+ @import url("../../../dojox/drawing/resources/drawing.css");
+ @import url("../../../dojox/drawing/resources/toolbar.css");
+ @import url("../../../dojox/drawing/resources/GreekPalette.css");
href, body{
}
.drawing{
@@ -57,6 +58,7 @@
dojo.require("dojox.drawing.ui.dom.Pan");
dojo.require("dojox.drawing.ui.dom.Zoom");
dojo.require("dojox.drawing.plugins.drawing.Grid");
+ dojo.require("dojox.drawing.plugins.drawing.GreekPalette");
var doExport = function(){
@@ -160,7 +162,7 @@
</div>
<div dojoType="dojox.drawing.Drawing" id="drawingNode" jsId="myDrawing" drawingType="canvas" class="drawing"
- plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{gap:100}}]">
+ plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{gap:100}},{'name':'dojox.drawing.plugins.drawing.GreekPalette'}]">
</div>
</div>
Modified: dojox/trunk/drawing/tests/test_drawing.html
==============================================================================
--- dojox/trunk/drawing/tests/test_drawing.html (original)
+++ dojox/trunk/drawing/tests/test_drawing.html Fri Jul 30 21:14:25 2010
@@ -1,10 +1,11 @@
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
<head>
<title>Drawing GFX Toolbar Test</title>
- <link href="../resources/drawing.css" rel="stylesheet" />
- <link href="../resources/toolbar.css" rel="stylesheet" />
-
<style>
+ @import url("../../../dijit/themes/dijit.css");
+ @import url("../../../dojox/drawing/resources/drawing.css");
+ @import url("../../../dojox/drawing/resources/toolbar.css");
+ @import url("../../../dojox/drawing/resources/GreekPalette.css");
href, body{
}
.drawing{
@@ -61,8 +62,9 @@
dojo.require("dojox.drawing.plugins.tools.Zoom");
dojo.require("dojox.drawing.plugins.tools.Iconize");
+ dojo.require("dojox.drawing.plugins.drawing.GreekPalette");
dojo.require("dojox.drawing.plugins.drawing.Grid");
-
+
dojo.require("dojox.drawing.ui.Toolbar");
dojo.require("dojox.drawing.ui.Button");
//dojo.require("dojox.drawing.ui.Tooltip");
@@ -89,7 +91,7 @@
drawing:myDrawing,
tools:"all",
plugs:"all",
- selected:"ellipse",
+ selected:"",
size:30,
radius:2,
margin:5
@@ -136,7 +138,7 @@
<div id="conEdit" contenteditable="true"></div>
<div id="wrapper">
<div dojoType="dojox.drawing.Drawing" id="drawingNode" jsId="myDrawing" class="drawing"
- plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{minor:20, major:100}}]">
+ plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{minor:20, major:100}},{'name':'dojox.drawing.plugins.drawing.GreekPalette'}]">
</div>
</div>
Modified: dojox/trunk/drawing/tests/test_drawing_toolbar.html
==============================================================================
--- dojox/trunk/drawing/tests/test_drawing_toolbar.html (original)
+++ dojox/trunk/drawing/tests/test_drawing_toolbar.html Fri Jul 30 21:14:25 2010
@@ -1,10 +1,11 @@
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
<head>
<title>Drawing Test</title>
- <link href="../resources/drawing.css" rel="stylesheet" />
- <link href="../resources/toolbar.css" rel="stylesheet" />
-
<style>
+ @import url("../../../dijit/themes/dijit.css");
+ @import url("../../../dojox/drawing/resources/drawing.css");
+ @import url("../../../dojox/drawing/resources/toolbar.css");
+ @import url("../../../dojox/drawing/resources/GreekPalette.css");
href, body{
overflow:hidden;
}
@@ -76,6 +77,7 @@
dojo.require("dojox.drawing.plugins.tools.Pan");
dojo.require("dojox.drawing.plugins.tools.Zoom");
dojo.require("dojox.drawing.plugins.drawing.Grid");
+ dojo.require("dojox.drawing.plugins.drawing.GreekPalette");
dojo.require("dojox.drawing.ui.Toolbar");
dojo.require("dojox.drawing.ui.Button");
@@ -93,7 +95,7 @@
<div dojoType="dojox.drawing.ui.Toolbar" id="gfxToolbarNode" drawingId="drawingNode" class="gfxToolbar" tools="all" plugs="all" selected="ellipse"></div>
<div dojoType="dojox.drawing.Drawing" id="drawingNode" jsId="myDrawing" class="drawing"
- plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{gap:100}}]">
+ plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{gap:100}},{'name':'dojox.drawing.plugins.drawing.GreekPalette'}]">
</div>
</div>
Modified: dojox/trunk/drawing/tests/test_paths.html
==============================================================================
--- dojox/trunk/drawing/tests/test_paths.html (original)
+++ dojox/trunk/drawing/tests/test_paths.html Fri Jul 30 21:14:25 2010
@@ -1,10 +1,11 @@
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
<head>
<title>Drawing Paths Test</title>
- <link href="../resources/drawing.css" rel="stylesheet" />
- <link href="../resources/toolbar.css" rel="stylesheet" />
-
<style>
+ @import url("../../../dijit/themes/dijit.css");
+ @import url("../../../dojox/drawing/resources/drawing.css");
+ @import url("../../../dojox/drawing/resources/toolbar.css");
+ @import url("../../../dojox/drawing/resources/GreekPalette.css");
href, body{
overflow:hidden;
}
@@ -54,6 +55,7 @@
dojo.require("dojox.drawing.tools.Path");
dojo.require("dojox.drawing.tools.Pencil");
+ dojo.require("dojox.drawing.plugins.drawing.GreekPalette");
dojo.require("dojox.drawing.plugins.drawing.Grid");
dojo.require("dojox.drawing.ui.Toolbar");
@@ -99,16 +101,16 @@
</script>
</head>
-<body>
+<body class="tundra">
<h2>Drawing Paths Test</h2>
<div id="conEdit" contenteditable="true"></div>
<div id="wrapper">
- <div dojoType="dojox.drawing.ui.Toolbar" id="gfxToolbarNode" drawingId="drawingNode" class="gfxToolbar" tools="all" plugs="all" selected="pencil"></div>
+ <div dojoType="dojox.drawing.ui.Toolbar" id="gfxToolbarNode" drawingId="drawingNode" class="gfxToolbar" orient="H" tools="all" plugs="all" selected="pencil"></div>
<div dojoType="dojox.drawing.Drawing" id="drawingNode" jsId="myDrawing" class="drawing"
- plugins="[{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{minor:20, major:100}}]">
+ plugins="[{'name':'dojox.drawing.plugins.drawing.GreekPalette'},{'name':'dojox.drawing.plugins.drawing.Grid', 'options':{minor:20, major:100}}]">
</div>
</div>
Modified: dojox/trunk/drawing/ui/Toolbar.js
==============================================================================
--- dojox/trunk/drawing/ui/Toolbar.js (original)
+++ dojox/trunk/drawing/ui/Toolbar.js Fri Jul 30 21:14:25 2010
@@ -23,7 +23,7 @@
// | });
//
// | <div dojoType="dojox.drawing.ui.Toolbar" id="gfxToolbarNode" drawingId="drawingNode"
- // | class="gfxToolbar" tools="all" plugs="all" selected="ellipse"></div>
+ // | class="gfxToolbar" tools="all" plugs="all" selected="ellipse" orient="H"></div>
//
//
constructor: function(props, node){
@@ -41,7 +41,8 @@
this.strTools = props.tools;
this.strPlugs = props.plugs;
this._mixprops(["padding", "margin", "size", "radius"], props);
- this.addBack()
+ this.addBack();
+ this.orient = props.orient ? props.orient : false;
}else{
// markup
var box = dojo.marginBox(node);
@@ -52,10 +53,11 @@
this.strPlugs = dojo.attr(node, "plugs");
this._mixprops(["padding", "margin", "size", "radius"], node);
this.toolDrawing = new dojox.drawing.Drawing({mode:"ui"}, node);
+ this.orient = dojo.attr(node, "orient");
}
- this.horizontal = this.width > this.height;
-
+ this.horizontal = this.orient ? this.orient == "H" : this.width > this.height;
+ console.log("this.hor: ",this.horizontal," orient: ",this.orient);
if(this.toolDrawing.ready){
this.makeButtons();
if(!this.strSelected && this.drawing.defaults.clickMode){ this.drawing.mouse.setCursor('default'); };
@@ -166,8 +168,7 @@
this.drawing.setTool(btn.toolType);
}
if(this.horizontal){
- var space = secondary ? h/2 + g : h + g;
- y += space;
+ x += h + g;
}else{
var space = secondary ? h/2 + g : h + g;
y += space;
@@ -176,7 +177,7 @@
}
if(this.horizontal){
- y += this.toolPlugGap;
+ x += this.toolPlugGap;
}else{
y += this.toolPlugGap;
}
@@ -204,7 +205,7 @@
this.plugins.push(btn);
if(this.horizontal){
- y += h + g;
+ x += h + g;
}else{
y += h + g;
}
More information about the Dojo-checkins
mailing list