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

fixing conflict

master
Mark MacKay 2020-12-14 19:08:26 -06:00
parent e3aeed3379 100dbe28b3
commit 9e770ba181
4 changed files with 76 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/all.js vendored
View File

@ -16313,7 +16313,7 @@ window.methodDraw = function() {
};
// called when we've selected a different element
var selectedChanged = function(window,elems) {
var selectedChanged = function(window,elems) {
var mode = svgCanvas.getMode();
if(mode === "select") setSelectMode();
if (mode === "pathedit") return updateContextPanel();
@ -16339,6 +16339,11 @@ window.methodDraw = function() {
$('#canvas_panel').show()
$('#tools_top').removeClass('multiselected')
}
// We need to update the context panel always when we've selected a different element. Otherwise some
// menu items are disabled even if they shouldn't be (e.g. group multiple elements)
updateContextPanel();
svgCanvas.runExtensions("selectedChanged", {
elems: elems,
selectedElement: selectedElement,
@ -16850,7 +16855,7 @@ window.methodDraw = function() {
}
if (!elem) {
menu_items.disableContextMenuItems('#delete,#cut,#copy,#group,#ungroup,#move_front,#move_up,#move_down,#move_back');
menu_items.disableContextMenuItems('#delete,#cut,#copy,#ungroup,#move_front,#move_up,#move_down,#move_back');
}
// update history buttons
@ -18856,6 +18861,7 @@ window.methodDraw = function() {
// Run init once DOM is loaded
$(methodDraw.init);
function Palette(){
var palette = [
"#444444", "#482816", "#422C10", "#3B2F0E", "#32320F",

38
dist/index.html vendored
View File

@ -433,12 +433,36 @@
</label>
<h4>.</h4>
<div class="col last clear">
<div class="draginput_cell" id="tool_alignleft" title="Align Left"></div>
<div class="draginput_cell" id="tool_aligncenter" title="Align Center"></div>
<div class="draginput_cell" id="tool_alignright" title="Align Right"></div>
<div class="draginput_cell" id="tool_aligntop" title="Align Top"></div>
<div class="draginput_cell" id="tool_alignmiddle" title="Align Middle"></div>
<div class="draginput_cell" id="tool_alignbottom" title="Align Bottom"></div>
<div class="draginput_cell" id="tool_alignleft" title="Align Left">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 2 1 L 2 5 L 14 5 L 14 11 L 2 11 L 2 16 L 20 16 L 20 22 L 2 22 L 2 26 L 1 26 L 1 1 L 2 1 Z" />
</svg>
</div>
<div class="draginput_cell" id="tool_aligncenter" title="Align Center">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 13 1 L 14 1 L 14 6 L 22 6 L 22 12 L 14 12 L 14 15 L 19 15 L 19 21 L 14 21 L 14 26 L 13 26 L 13 21 L 8 21 L 8 15 L 13 15 L 13 12 L 5 12 L 5 6 L 13 6 L 13 1 Z" />
</svg>
</div>
<div class="draginput_cell" id="tool_alignright" title="Align Right">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 25 1 L 25 5 L 13 5 L 13 11 L 25 11 L 25 16 L 7 16 L 7 22 L 25 22 L 25 26 L 26 26 L 26 1 L 25 1 Z"/>
</svg>
</div>
<div class="draginput_cell" id="tool_aligntop" title="Align Top">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 1 2 L 5 2 L 5 14 L 11 14 L 11 2 L 16 2 L 16 20 L 22 20 L 22 2 L 26 2 L 26 1 L 1 1 L 1 2 Z"/>
</svg>
</div>
<div class="draginput_cell" id="tool_alignmiddle" title="Align Middle">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 26 13 L 26 14 L 21 14 L 21 22 L 15 22 L 15 14 L 12 14 L 12 19 L 6 19 L 6 14 L 1 14 L 1 13 L 6 13 L 6 8 L 12 8 L 12 13 L 15 13 L 15 5 L 21 5 L 21 13 L 26 13 Z"/>
</svg>
</div>
<div class="draginput_cell" id="tool_alignbottom" title="Align Bottom">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 1 25 L 5 25 L 5 13 L 11 13 L 11 25 L 16 25 L 16 7 L 22 7 L 22 25 L 26 25 L 26 26 L 1 26 L 1 25"/>
</svg>
</div>
</div>
</div>
<div class="clearfix"></div>
@ -631,9 +655,7 @@
<div class="tools_flyout" id="tools_shapelib">
<div id="shape_buttons"></div>
</div>
<script src="all.js?t=1606774407760"></script>
</body>
</html>

36
src/index.html
View File

@ -447,12 +447,36 @@
</label>
<h4>.</h4>
<div class="col last clear">
<div class="draginput_cell" id="tool_alignleft" title="Align Left"></div>
<div class="draginput_cell" id="tool_aligncenter" title="Align Center"></div>
<div class="draginput_cell" id="tool_alignright" title="Align Right"></div>
<div class="draginput_cell" id="tool_aligntop" title="Align Top"></div>
<div class="draginput_cell" id="tool_alignmiddle" title="Align Middle"></div>
<div class="draginput_cell" id="tool_alignbottom" title="Align Bottom"></div>
<div class="draginput_cell" id="tool_alignleft" title="Align Left">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 2 1 L 2 5 L 14 5 L 14 11 L 2 11 L 2 16 L 20 16 L 20 22 L 2 22 L 2 26 L 1 26 L 1 1 L 2 1 Z" />
</svg>
</div>
<div class="draginput_cell" id="tool_aligncenter" title="Align Center">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 13 1 L 14 1 L 14 6 L 22 6 L 22 12 L 14 12 L 14 15 L 19 15 L 19 21 L 14 21 L 14 26 L 13 26 L 13 21 L 8 21 L 8 15 L 13 15 L 13 12 L 5 12 L 5 6 L 13 6 L 13 1 Z" />
</svg>
</div>
<div class="draginput_cell" id="tool_alignright" title="Align Right">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 25 1 L 25 5 L 13 5 L 13 11 L 25 11 L 25 16 L 7 16 L 7 22 L 25 22 L 25 26 L 26 26 L 26 1 L 25 1 Z"/>
</svg>
</div>
<div class="draginput_cell" id="tool_aligntop" title="Align Top">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 1 2 L 5 2 L 5 14 L 11 14 L 11 2 L 16 2 L 16 20 L 22 20 L 22 2 L 26 2 L 26 1 L 1 1 L 1 2 Z"/>
</svg>
</div>
<div class="draginput_cell" id="tool_alignmiddle" title="Align Middle">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 26 13 L 26 14 L 21 14 L 21 22 L 15 22 L 15 14 L 12 14 L 12 19 L 6 19 L 6 14 L 1 14 L 1 13 L 6 13 L 6 8 L 12 8 L 12 13 L 15 13 L 15 5 L 21 5 L 21 13 L 26 13 Z"/>
</svg>
</div>
<div class="draginput_cell" id="tool_alignbottom" title="Align Bottom">
<svg viewBox="0 0 27 27" xmlns="http://www.w3.org/2000/svg" width="27" height="27">
<path d="M 1 25 L 5 25 L 5 13 L 11 13 L 11 25 L 16 25 L 16 7 L 22 7 L 22 25 L 26 25 L 26 26 L 1 26 L 1 25"/>
</svg>
</div>
</div>
</div>
<div class="clearfix"></div>

11
src/js/method-draw.js
View File

@ -141,7 +141,7 @@ window.methodDraw = function() {
};
// called when we've selected a different element
var selectedChanged = function(window,elems) {
var selectedChanged = function(window,elems) {
var mode = svgCanvas.getMode();
if(mode === "select") setSelectMode();
if (mode === "pathedit") return updateContextPanel();
@ -167,6 +167,11 @@ window.methodDraw = function() {
$('#canvas_panel').show()
$('#tools_top').removeClass('multiselected')
}
// We need to update the context panel always when we've selected a different element. Otherwise some
// menu items are disabled even if they shouldn't be (e.g. group multiple elements)
updateContextPanel();
svgCanvas.runExtensions("selectedChanged", {
elems: elems,
selectedElement: selectedElement,
@ -678,7 +683,7 @@ window.methodDraw = function() {
}
if (!elem) {
menu_items.disableContextMenuItems('#delete,#cut,#copy,#group,#ungroup,#move_front,#move_up,#move_down,#move_back');
menu_items.disableContextMenuItems('#delete,#cut,#copy,#ungroup,#move_front,#move_up,#move_down,#move_back');
}
// update history buttons
@ -2683,4 +2688,4 @@ window.methodDraw = function() {
}(jQuery);
// Run init once DOM is loaded
$(methodDraw.init);
$(methodDraw.init);