zcy
/
websch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathedit mode fix

master
Mark MacKay 2012-07-28 20:24:41 -05:00
parent ce899e72d6
commit a65f3a7cbf
13 changed files with 1107 additions and 1107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/svg-editor.css
View File

@ -967,10 +967,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
opacity: 0; opacity: 0;
} }
#tool_italic {
font-weight: normal;
font-style: italic;
}
#url_notice { #url_notice {
padding-top: 4px; padding-top: 4px;
@ -1806,6 +1803,9 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
#tool_italic { #tool_italic {
border-top: solid #2f2f2c 2px; border-top: solid #2f2f2c 2px;
top: 35px; top: 35px;
font-weight: bold;
font-style: italic;
font-size: 24px;
} }

1
editor/svg-editor.html
View File

@ -50,6 +50,7 @@
<script type="text/javascript" src="mousewheel.js"></script> <script type="text/javascript" src="mousewheel.js"></script>
<script type="text/javascript" src="extensions/ext-eyedropper.js"></script> <script type="text/javascript" src="extensions/ext-eyedropper.js"></script>
<script type="text/javascript" src="extensions/ext-shapes.js"></script> <script type="text/javascript" src="extensions/ext-shapes.js"></script>
<script type="text/javascript" src="extensions/ext-grid.js"></script>
<script type="text/javascript" src="requestanimationframe.js"></script> <script type="text/javascript" src="requestanimationframe.js"></script>
<script type="text/javascript" src="taphold.js"></script> <script type="text/javascript" src="taphold.js"></script>
<script type="text/javascript" src="extensions/ext-server_opensave.js"></script> <script type="text/javascript" src="extensions/ext-server_opensave.js"></script>

59
editor/svg-editor.js
View File

@ -431,19 +431,15 @@
} }
var togglePathEditMode = function(editmode, elems) { var togglePathEditMode = function(editmode, elems) {
$('#path_node_panel').toggle(editmode);
$('#tools_bottom_2,#tools_bottom_3').toggle(!editmode); $('#tools_bottom_2,#tools_bottom_3').toggle(!editmode);
if(editmode) { if(editmode) {
// Change select icon // Change select icon
$('.context_panel').hide();
$('#path_node_panel').show();
$('.tool_button_current').removeClass('tool_button_current').addClass('tool_button'); $('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
$('#tool_canvas').hide();
$('#tool_select').addClass('tool_button_current').removeClass('tool_button'); $('#tool_select').addClass('tool_button_current').removeClass('tool_button');
setIcon('#tool_select', 'select_node'); setIcon('#tool_select', 'select_node');
multiselected = false; multiselected = false;
if(elems.length) {
selectedElement = elems[0];
}
} else { } else {
if (elems[0]) { if (elems[0]) {
var selector = svgCanvas.selectorManager.requestSelector(elems[0]) var selector = svgCanvas.selectorManager.requestSelector(elems[0])
@ -547,31 +543,32 @@
if(mode === "select") setSelectMode(); if(mode === "select") setSelectMode();
var is_node = (mode == "pathedit"); var is_node = (mode == "pathedit");
// if elems[1] is present, then we have more than one element // if elems[1] is present, then we have more than one element
selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null); if (!is_node) {
elems = elems.filter(Boolean) selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null);
multiselected = (elems.length >= 2) ? elems : false; elems = elems.filter(Boolean)
if (svgCanvas.elementsAreSame(multiselected)) selectedElement = multiselected[0] multiselected = (elems.length >= 2) ? elems : false;
if (svgCanvas.elementsAreSame(multiselected)) selectedElement = multiselected[0]
if (selectedElement != null) { if (selectedElement != null) {
if (!is_node) { if (!is_node) {
$('#multiselected_panel').hide() $('#multiselected_panel').hide()
updateToolbar(); updateToolbar();
} }
if (multiselected.length) {//multiselected elements are the same if (multiselected.length) {//multiselected elements are the same
$('#tools_top').addClass('multiselected') $('#tools_top').addClass('multiselected')
} }
}
else if (multiselected.length) {
$('.context_panel').hide()
$('#tools_top').removeClass('multiselected')
$('#multiselected_panel').show()
}
else {
$('.context_panel').hide()
$('#canvas_panel').show()
$('#tools_top').removeClass('multiselected')
}
} }
else if (multiselected.length) {
$('.context_panel').hide()
$('#tools_top').removeClass('multiselected')
$('#multiselected_panel').show()
}
else {
$('.context_panel').hide()
$('#canvas_panel').show()
$('#tools_top').removeClass('multiselected')
}
togglePathEditMode(is_node, elems); togglePathEditMode(is_node, elems);
svgCanvas.runExtensions("selectedChanged", { svgCanvas.runExtensions("selectedChanged", {
elems: elems, elems: elems,
@ -2252,6 +2249,7 @@
svgCanvas.setMode("pathedit") svgCanvas.setMode("pathedit")
path.toEditMode(elems[0]); path.toEditMode(elems[0]);
svgCanvas.clearSelection(); svgCanvas.clearSelection();
selectedChanged()
} }
} }
@ -2823,10 +2821,11 @@
var title = (picker == 'stroke' ? 'Pick a Stroke Paint and Opacity' : 'Pick a Fill Paint and Opacity'); var title = (picker == 'stroke' ? 'Pick a Stroke Paint and Opacity' : 'Pick a Fill Paint and Opacity');
var was_none = false; var was_none = false;
var pos = is_background ? {'right': 200, 'top': 50} : {'left': 45, 'bottom': 50} var pos = is_background ? {'right': 175, 'top': 50} : {'left': 50, 'bottom': 50}
$("#color_picker") $("#color_picker")
.draggable({cancel:'.jGraduate_tabs, .jGraduate_colPick, .jGraduate_gradPick, .jPicker', containment: 'window'}) .draggable({cancel:'.jGraduate_tabs, .jGraduate_colPick, .jGraduate_gradPick, .jPicker', containment: 'window'})
.removeAttr("style")
.css(pos) .css(pos)
.jGraduate( .jGraduate(
{ {

3
editor/svgedit.compiled.css
View File

@ -246,7 +246,6 @@ input[type=submit]:active,button:active{box-shadow:inset 0 2px 2px rgba(0,0,0,0.
.width_label{padding-right:5px} .width_label{padding-right:5px}
#text{position:absolute;left:-9999px} #text{position:absolute;left:-9999px}
#tool_bold span,#tool_italic span{position:absolute;width:100%;height:100%;top:0;left:0;background:#ccc;opacity:0} #tool_bold span,#tool_italic span{position:absolute;width:100%;height:100%;top:0;left:0;background:#ccc;opacity:0}
#tool_italic{font-weight:normal;font-style:italic}
#url_notice{padding-top:4px;display:none} #url_notice{padding-top:4px;display:none}
#color_picker{position:absolute;display:none;background:#fff;height:350px;border-radius:3px;z-index:5;box-shadow:0 5px 10px #000;width:530px} #color_picker{position:absolute;display:none;background:#fff;height:350px;border-radius:3px;z-index:5;box-shadow:0 5px 10px #000;width:530px}
.tools_flyout{position:absolute;display:none;cursor:pointer;width:385px;z-index:10;left:47px!important;height:324px;background:#fff;border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.5)} .tools_flyout{position:absolute;display:none;cursor:pointer;width:385px;z-index:10;left:47px!important;height:324px;background:#fff;border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.5)}
@ -382,7 +381,7 @@ button.cancel,input.Cancel,input.cancel,input.jGraduate_Cancel,button.cancel{-we
#tool_font_family .caret{right:40px;top:55%} #tool_font_family .caret{right:40px;top:55%}
#tool_font_family select{width:110px} #tool_font_family select{width:110px}
#tool_bold,#tool_italic{font:bold 20px/35px serif;text-align:center;position:absolute;padding:0;color:#ccc;background:transparent;border:0;width:35px;height:35px;margin:0;top:0;right:0} #tool_bold,#tool_italic{font:bold 20px/35px serif;text-align:center;position:absolute;padding:0;color:#ccc;background:transparent;border:0;width:35px;height:35px;margin:0;top:0;right:0}
#tool_italic{border-top:solid #2f2f2c 2px;top:35px} #tool_italic{border-top:solid #2f2f2c 2px;top:35px;font-weight:bold;font-style:italic;font-size:24px}
#tool_bold:hover,#tool_italic:hover{color:#fff} #tool_bold:hover,#tool_italic:hover{color:#fff}
#tool_bold.active,#tool_italic.active{color:#50a0ff} #tool_bold.active,#tool_italic.active{color:#50a0ff}
#preview_font{font-size:20px;color:#fff;height:70px;line-height:75px;padding:0 0 0 10px;white-space:nowrap;width:100px;overflow:hidden;border-right:solid #2f2f2c 2px;position:relative} #preview_font{font-size:20px;color:#fff;height:70px;line-height:75px;padding:0 0 0 10px;white-space:nowrap;width:100px;overflow:hidden;border-right:solid #2f2f2c 2px;position:relative}

1025
editor/svgedit.compiled.js
View File

File diff suppressed because it is too large Load Diff

8
editor/temp.css
View File

@ -1612,10 +1612,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
opacity: 0; opacity: 0;
} }
#tool_italic {
font-weight: normal;
font-style: italic;
}
#url_notice { #url_notice {
padding-top: 4px; padding-top: 4px;
@ -2451,6 +2448,9 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
#tool_italic { #tool_italic {
border-top: solid #2f2f2c 2px; border-top: solid #2f2f2c 2px;
top: 35px; top: 35px;
font-weight: bold;
font-style: italic;
font-size: 24px;
} }

6
method-draw/index.html
View File

@ -165,7 +165,7 @@ $(function(){
<div id="tools_top" class="tools_panel"> <div id="tools_top" class="tools_panel">
<div id="canvas_panel" class="context_panel clearfix"> <div id="canvas_panel" class="context_panel">
<h4 class="clearfix">Canvas</h4> <h4 class="clearfix">Canvas</h4>
@ -316,7 +316,7 @@ $(function(){
</label> </label>
</div> </div>
<div id="text_panel" class="context_panel clearfix"> <div id="text_panel" class="context_panel">
<h4>Text</h4> <h4>Text</h4>
<label> <label>
<input id="text_x" class="attr_changer" data-title="Change text x coordinate" size="3" data-attr="x" pattern="[0-9]*" /> <input id="text_x" class="attr_changer" data-title="Change text x coordinate" size="3" data-attr="x" pattern="[0-9]*" />
@ -418,7 +418,7 @@ $(function(){
</div> </div>
<!-- Buttons when a single element is selected --> <!-- Buttons when a single element is selected -->
<div id="selected_panel" class="context_panel clearfix"> <div id="selected_panel" class="context_panel">
<label id="tool_angle" data-title="Change rotation angle" class="draginput"> <label id="tool_angle" data-title="Change rotation angle" class="draginput">
<input id="angle" class="attr_changer" size="2" value="0" data-min="-180" data-max="180" type="text"/> <input id="angle" class="attr_changer" size="2" value="0" data-min="-180" data-max="180" type="text"/>

8
method-draw/svg-editor.css
View File

@ -967,10 +967,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
opacity: 0; opacity: 0;
} }
#tool_italic {
font-weight: normal;
font-style: italic;
}
#url_notice { #url_notice {
padding-top: 4px; padding-top: 4px;
@ -1806,6 +1803,9 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
#tool_italic { #tool_italic {
border-top: solid #2f2f2c 2px; border-top: solid #2f2f2c 2px;
top: 35px; top: 35px;
font-weight: bold;
font-style: italic;
font-size: 24px;
} }

1
method-draw/svg-editor.html
View File

@ -50,6 +50,7 @@
<script type="text/javascript" src="mousewheel.js"></script> <script type="text/javascript" src="mousewheel.js"></script>
<script type="text/javascript" src="extensions/ext-eyedropper.js"></script> <script type="text/javascript" src="extensions/ext-eyedropper.js"></script>
<script type="text/javascript" src="extensions/ext-shapes.js"></script> <script type="text/javascript" src="extensions/ext-shapes.js"></script>
<script type="text/javascript" src="extensions/ext-grid.js"></script>
<script type="text/javascript" src="requestanimationframe.js"></script> <script type="text/javascript" src="requestanimationframe.js"></script>
<script type="text/javascript" src="taphold.js"></script> <script type="text/javascript" src="taphold.js"></script>
<script type="text/javascript" src="extensions/ext-server_opensave.js"></script> <script type="text/javascript" src="extensions/ext-server_opensave.js"></script>

59
method-draw/svg-editor.js
View File

@ -431,19 +431,15 @@
} }
var togglePathEditMode = function(editmode, elems) { var togglePathEditMode = function(editmode, elems) {
$('#path_node_panel').toggle(editmode);
$('#tools_bottom_2,#tools_bottom_3').toggle(!editmode); $('#tools_bottom_2,#tools_bottom_3').toggle(!editmode);
if(editmode) { if(editmode) {
// Change select icon // Change select icon
$('.context_panel').hide();
$('#path_node_panel').show();
$('.tool_button_current').removeClass('tool_button_current').addClass('tool_button'); $('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
$('#tool_canvas').hide();
$('#tool_select').addClass('tool_button_current').removeClass('tool_button'); $('#tool_select').addClass('tool_button_current').removeClass('tool_button');
setIcon('#tool_select', 'select_node'); setIcon('#tool_select', 'select_node');
multiselected = false; multiselected = false;
if(elems.length) {
selectedElement = elems[0];
}
} else { } else {
if (elems[0]) { if (elems[0]) {
var selector = svgCanvas.selectorManager.requestSelector(elems[0]) var selector = svgCanvas.selectorManager.requestSelector(elems[0])
@ -547,31 +543,32 @@
if(mode === "select") setSelectMode(); if(mode === "select") setSelectMode();
var is_node = (mode == "pathedit"); var is_node = (mode == "pathedit");
// if elems[1] is present, then we have more than one element // if elems[1] is present, then we have more than one element
selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null); if (!is_node) {
elems = elems.filter(Boolean) selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null);
multiselected = (elems.length >= 2) ? elems : false; elems = elems.filter(Boolean)
if (svgCanvas.elementsAreSame(multiselected)) selectedElement = multiselected[0] multiselected = (elems.length >= 2) ? elems : false;
if (svgCanvas.elementsAreSame(multiselected)) selectedElement = multiselected[0]
if (selectedElement != null) { if (selectedElement != null) {
if (!is_node) { if (!is_node) {
$('#multiselected_panel').hide() $('#multiselected_panel').hide()
updateToolbar(); updateToolbar();
} }
if (multiselected.length) {//multiselected elements are the same if (multiselected.length) {//multiselected elements are the same
$('#tools_top').addClass('multiselected') $('#tools_top').addClass('multiselected')
} }
}
else if (multiselected.length) {
$('.context_panel').hide()
$('#tools_top').removeClass('multiselected')
$('#multiselected_panel').show()
}
else {
$('.context_panel').hide()
$('#canvas_panel').show()
$('#tools_top').removeClass('multiselected')
}
} }
else if (multiselected.length) {
$('.context_panel').hide()
$('#tools_top').removeClass('multiselected')
$('#multiselected_panel').show()
}
else {
$('.context_panel').hide()
$('#canvas_panel').show()
$('#tools_top').removeClass('multiselected')
}
togglePathEditMode(is_node, elems); togglePathEditMode(is_node, elems);
svgCanvas.runExtensions("selectedChanged", { svgCanvas.runExtensions("selectedChanged", {
elems: elems, elems: elems,
@ -2252,6 +2249,7 @@
svgCanvas.setMode("pathedit") svgCanvas.setMode("pathedit")
path.toEditMode(elems[0]); path.toEditMode(elems[0]);
svgCanvas.clearSelection(); svgCanvas.clearSelection();
selectedChanged()
} }
} }
@ -2823,10 +2821,11 @@
var title = (picker == 'stroke' ? 'Pick a Stroke Paint and Opacity' : 'Pick a Fill Paint and Opacity'); var title = (picker == 'stroke' ? 'Pick a Stroke Paint and Opacity' : 'Pick a Fill Paint and Opacity');
var was_none = false; var was_none = false;
var pos = is_background ? {'right': 200, 'top': 50} : {'left': 45, 'bottom': 50} var pos = is_background ? {'right': 175, 'top': 50} : {'left': 50, 'bottom': 50}
$("#color_picker") $("#color_picker")
.draggable({cancel:'.jGraduate_tabs, .jGraduate_colPick, .jGraduate_gradPick, .jPicker', containment: 'window'}) .draggable({cancel:'.jGraduate_tabs, .jGraduate_colPick, .jGraduate_gradPick, .jPicker', containment: 'window'})
.removeAttr("style")
.css(pos) .css(pos)
.jGraduate( .jGraduate(
{ {

3
method-draw/svgedit.compiled.css
View File

@ -246,7 +246,6 @@ input[type=submit]:active,button:active{box-shadow:inset 0 2px 2px rgba(0,0,0,0.
.width_label{padding-right:5px} .width_label{padding-right:5px}
#text{position:absolute;left:-9999px} #text{position:absolute;left:-9999px}
#tool_bold span,#tool_italic span{position:absolute;width:100%;height:100%;top:0;left:0;background:#ccc;opacity:0} #tool_bold span,#tool_italic span{position:absolute;width:100%;height:100%;top:0;left:0;background:#ccc;opacity:0}
#tool_italic{font-weight:normal;font-style:italic}
#url_notice{padding-top:4px;display:none} #url_notice{padding-top:4px;display:none}
#color_picker{position:absolute;display:none;background:#fff;height:350px;border-radius:3px;z-index:5;box-shadow:0 5px 10px #000;width:530px} #color_picker{position:absolute;display:none;background:#fff;height:350px;border-radius:3px;z-index:5;box-shadow:0 5px 10px #000;width:530px}
.tools_flyout{position:absolute;display:none;cursor:pointer;width:385px;z-index:10;left:47px!important;height:324px;background:#fff;border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.5)} .tools_flyout{position:absolute;display:none;cursor:pointer;width:385px;z-index:10;left:47px!important;height:324px;background:#fff;border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.5)}
@ -382,7 +381,7 @@ button.cancel,input.Cancel,input.cancel,input.jGraduate_Cancel,button.cancel{-we
#tool_font_family .caret{right:40px;top:55%} #tool_font_family .caret{right:40px;top:55%}
#tool_font_family select{width:110px} #tool_font_family select{width:110px}
#tool_bold,#tool_italic{font:bold 20px/35px serif;text-align:center;position:absolute;padding:0;color:#ccc;background:transparent;border:0;width:35px;height:35px;margin:0;top:0;right:0} #tool_bold,#tool_italic{font:bold 20px/35px serif;text-align:center;position:absolute;padding:0;color:#ccc;background:transparent;border:0;width:35px;height:35px;margin:0;top:0;right:0}
#tool_italic{border-top:solid #2f2f2c 2px;top:35px} #tool_italic{border-top:solid #2f2f2c 2px;top:35px;font-weight:bold;font-style:italic;font-size:24px}
#tool_bold:hover,#tool_italic:hover{color:#fff} #tool_bold:hover,#tool_italic:hover{color:#fff}
#tool_bold.active,#tool_italic.active{color:#50a0ff} #tool_bold.active,#tool_italic.active{color:#50a0ff}
#preview_font{font-size:20px;color:#fff;height:70px;line-height:75px;padding:0 0 0 10px;white-space:nowrap;width:100px;overflow:hidden;border-right:solid #2f2f2c 2px;position:relative} #preview_font{font-size:20px;color:#fff;height:70px;line-height:75px;padding:0 0 0 10px;white-space:nowrap;width:100px;overflow:hidden;border-right:solid #2f2f2c 2px;position:relative}

1025
method-draw/svgedit.compiled.js
View File

File diff suppressed because it is too large Load Diff

8
method-draw/temp.css
View File

@ -1612,10 +1612,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
opacity: 0; opacity: 0;
} }
#tool_italic {
font-weight: normal;
font-style: italic;
}
#url_notice { #url_notice {
padding-top: 4px; padding-top: 4px;
@ -2451,6 +2448,9 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
#tool_italic { #tool_italic {
border-top: solid #2f2f2c 2px; border-top: solid #2f2f2c 2px;
top: 35px; top: 35px;
font-weight: bold;
font-style: italic;
font-size: 24px;
} }