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

source editor no longer brreaks stuff

master
Mark MacKay 2012-07-25 18:02:29 -05:00
parent 65badf348e
commit 8fd6cbe529
12 changed files with 1156 additions and 1194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/svg-editor.css
View File

@ -715,7 +715,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
} }
input[type=submit]:hover, button:hover {background: #2F84C1;} input[type=submit]:hover, button:hover {background: #2F84C1;}
input[type=submit]:active, button:active {padding: 6px 10px 4px 10px; box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;} input[type=submit]:active, button:active { box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;}
#tools_left { #tools_left {

14
editor/svg-editor.js
View File

@ -724,8 +724,6 @@
} }
$('#cur_context_panel').toggle(!!context).html(link_str); $('#cur_context_panel').toggle(!!context).html(link_str);
updateTitle();
} }
// Makes sure the current selected paint is available to work with // Makes sure the current selected paint is available to work with
@ -2558,7 +2556,6 @@
svgCanvas.clearSelection(); svgCanvas.clearSelection();
hideSourceEditor(); hideSourceEditor();
zoomImage(); zoomImage();
updateTitle();
prepPaints(); prepPaints();
} }
@ -2573,17 +2570,6 @@
setSelectMode(); setSelectMode();
}; };
var updateTitle = function(title) {
title = title || svgCanvas.getDocumentTitle();
var new_title = orig_title + (title?': ' + title:'');
// Remove title update with current context info, isn't really necessary
// if(cur_context) {
// new_title = new_title + cur_context;
// }
$('title:first').text(new_title);
}
function setBackground(color, url) { function setBackground(color, url) {
// if(color == curPrefs.bkgd_color && url == curPrefs.bkgd_url) return; // if(color == curPrefs.bkgd_color && url == curPrefs.bkgd_url) return;
$.pref('bkgd_color', color); $.pref('bkgd_color', color);

4
editor/svgcanvas.js
View File

@ -2736,7 +2736,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return; if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return;
if (!started) return; if (!started) return;
if(evt.button === 1 || canvas.spaceKey) return; if(evt.button === 1 || canvas.spaceKey) return;
var selected = selectedElements[0], var selected = selectedElements[0],
pt = transformPoint( evt.pageX, evt.pageY, root_sctm ), pt = transformPoint( evt.pageX, evt.pageY, root_sctm ),
mouse_x = pt.x * current_zoom, mouse_x = pt.x * current_zoom,
@ -2769,7 +2768,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
} }
if(evt.shiftKey) { var xya = snapToAngle(start_x,start_y,x,y); x=xya.x; y=xya.y; } if(evt.shiftKey) { var xya = snapToAngle(start_x,start_y,x,y); x=xya.x; y=xya.y; }
if (dx != 0 || dy != 0) { if (dx != 0 || dy != 0) {
var len = selectedElements.length; var len = selectedElements.length;
for (var i = 0; i < len; ++i) { for (var i = 0; i < len; ++i) {
@ -3862,7 +3860,6 @@ var textActions = canvas.textActions = function() {
// TODO: Find way to block native selection // TODO: Find way to block native selection
}, },
mouseMove: function(mouse_x, mouse_y) { mouseMove: function(mouse_x, mouse_y) {
if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return;
var pt = screenToPt(mouse_x, mouse_y); var pt = screenToPt(mouse_x, mouse_y);
setEndSelectionFromPoint(pt.x, pt.y); setEndSelectionFromPoint(pt.x, pt.y);
}, },
@ -4372,7 +4369,6 @@ var pathActions = canvas.pathActions = function() {
} }
}, },
mouseMove: function(evt, mouse_x, mouse_y) { mouseMove: function(evt, mouse_x, mouse_y) {
if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return;
hasMoved = true; hasMoved = true;
if(current_mode === "path") { if(current_mode === "path") {
if(!drawn_path) return; if(!drawn_path) return;

2
editor/svgedit.compiled.css
View File

@ -212,7 +212,7 @@ input[type=text].tuco,input[type=number].tuco{width:150px}
input[type=submit],input[type=button],button{background:#4f80ff;color:#fff;border-radius:3px;padding:7px 17px;border:0;line-height:140%;font-size:14px;font-weight:bold;font-family:sans-serif} input[type=submit],input[type=button],button{background:#4f80ff;color:#fff;border-radius:3px;padding:7px 17px;border:0;line-height:140%;font-size:14px;font-weight:bold;font-family:sans-serif}
input[type=submit]:hover,button:hover{box-shadow:inset 0 3px 10px rgba(255,255,255,0.1),inset 0 -3px 10px rgba(0,0,0,0.2)} input[type=submit]:hover,button:hover{box-shadow:inset 0 3px 10px rgba(255,255,255,0.1),inset 0 -3px 10px rgba(0,0,0,0.2)}
input[type=submit]:hover,button:hover{background:#2f84c1} input[type=submit]:hover,button:hover{background:#2f84c1}
input[type=submit]:active,button:active{padding:6px 10px 4px 10px;box-shadow:inset 0 2px 2px rgba(0,0,0,0.2);border-bottom:solid rgba(255,255,255,0.1) 1px} input[type=submit]:active,button:active{box-shadow:inset 0 2px 2px rgba(0,0,0,0.2);border-bottom:solid rgba(255,255,255,0.1) 1px}
#tools_left{position:absolute;border-right:0;width:50px;top:30px;left:0;background:#2f2f2c;z-index:4} #tools_left{position:absolute;border-right:0;width:50px;top:30px;left:0;background:#2f2f2c;z-index:4}
#workarea.wireframe #svgcontent *{fill:none;stroke:#000;stroke-width:1px;stroke-opacity:1.0;stroke-dasharray:0;opacity:1;pointer-events:stroke;vector-effect:non-scaling-stroke;filter:none} #workarea.wireframe #svgcontent *{fill:none;stroke:#000;stroke-width:1px;stroke-opacity:1.0;stroke-dasharray:0;opacity:1;pointer-events:stroke;vector-effect:non-scaling-stroke;filter:none}
#workarea.wireframe #svgcontent text{fill:#000;stroke:none} #workarea.wireframe #svgcontent text{fill:#000;stroke:none}

1151
editor/svgedit.compiled.js
View File

File diff suppressed because it is too large Load Diff

2
editor/temp.css
View File

@ -1360,7 +1360,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
} }
input[type=submit]:hover, button:hover {background: #2F84C1;} input[type=submit]:hover, button:hover {background: #2F84C1;}
input[type=submit]:active, button:active {padding: 6px 10px 4px 10px; box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;} input[type=submit]:active, button:active { box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;}
#tools_left { #tools_left {

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

@ -715,7 +715,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
} }
input[type=submit]:hover, button:hover {background: #2F84C1;} input[type=submit]:hover, button:hover {background: #2F84C1;}
input[type=submit]:active, button:active {padding: 6px 10px 4px 10px; box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;} input[type=submit]:active, button:active { box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;}
#tools_left { #tools_left {

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

@ -724,8 +724,6 @@
} }
$('#cur_context_panel').toggle(!!context).html(link_str); $('#cur_context_panel').toggle(!!context).html(link_str);
updateTitle();
} }
// Makes sure the current selected paint is available to work with // Makes sure the current selected paint is available to work with
@ -2558,7 +2556,6 @@
svgCanvas.clearSelection(); svgCanvas.clearSelection();
hideSourceEditor(); hideSourceEditor();
zoomImage(); zoomImage();
updateTitle();
prepPaints(); prepPaints();
} }
@ -2573,17 +2570,6 @@
setSelectMode(); setSelectMode();
}; };
var updateTitle = function(title) {
title = title || svgCanvas.getDocumentTitle();
var new_title = orig_title + (title?': ' + title:'');
// Remove title update with current context info, isn't really necessary
// if(cur_context) {
// new_title = new_title + cur_context;
// }
$('title:first').text(new_title);
}
function setBackground(color, url) { function setBackground(color, url) {
// if(color == curPrefs.bkgd_color && url == curPrefs.bkgd_url) return; // if(color == curPrefs.bkgd_color && url == curPrefs.bkgd_url) return;
$.pref('bkgd_color', color); $.pref('bkgd_color', color);

4
method-draw/svgcanvas.js
View File

@ -2736,7 +2736,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return; if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return;
if (!started) return; if (!started) return;
if(evt.button === 1 || canvas.spaceKey) return; if(evt.button === 1 || canvas.spaceKey) return;
var selected = selectedElements[0], var selected = selectedElements[0],
pt = transformPoint( evt.pageX, evt.pageY, root_sctm ), pt = transformPoint( evt.pageX, evt.pageY, root_sctm ),
mouse_x = pt.x * current_zoom, mouse_x = pt.x * current_zoom,
@ -2769,7 +2768,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
} }
if(evt.shiftKey) { var xya = snapToAngle(start_x,start_y,x,y); x=xya.x; y=xya.y; } if(evt.shiftKey) { var xya = snapToAngle(start_x,start_y,x,y); x=xya.x; y=xya.y; }
if (dx != 0 || dy != 0) { if (dx != 0 || dy != 0) {
var len = selectedElements.length; var len = selectedElements.length;
for (var i = 0; i < len; ++i) { for (var i = 0; i < len; ++i) {
@ -3862,7 +3860,6 @@ var textActions = canvas.textActions = function() {
// TODO: Find way to block native selection // TODO: Find way to block native selection
}, },
mouseMove: function(mouse_x, mouse_y) { mouseMove: function(mouse_x, mouse_y) {
if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return;
var pt = screenToPt(mouse_x, mouse_y); var pt = screenToPt(mouse_x, mouse_y);
setEndSelectionFromPoint(pt.x, pt.y); setEndSelectionFromPoint(pt.x, pt.y);
}, },
@ -4372,7 +4369,6 @@ var pathActions = canvas.pathActions = function() {
} }
}, },
mouseMove: function(evt, mouse_x, mouse_y) { mouseMove: function(evt, mouse_x, mouse_y) {
if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return;
hasMoved = true; hasMoved = true;
if(current_mode === "path") { if(current_mode === "path") {
if(!drawn_path) return; if(!drawn_path) return;

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

@ -212,7 +212,7 @@ input[type=text].tuco,input[type=number].tuco{width:150px}
input[type=submit],input[type=button],button{background:#4f80ff;color:#fff;border-radius:3px;padding:7px 17px;border:0;line-height:140%;font-size:14px;font-weight:bold;font-family:sans-serif} input[type=submit],input[type=button],button{background:#4f80ff;color:#fff;border-radius:3px;padding:7px 17px;border:0;line-height:140%;font-size:14px;font-weight:bold;font-family:sans-serif}
input[type=submit]:hover,button:hover{box-shadow:inset 0 3px 10px rgba(255,255,255,0.1),inset 0 -3px 10px rgba(0,0,0,0.2)} input[type=submit]:hover,button:hover{box-shadow:inset 0 3px 10px rgba(255,255,255,0.1),inset 0 -3px 10px rgba(0,0,0,0.2)}
input[type=submit]:hover,button:hover{background:#2f84c1} input[type=submit]:hover,button:hover{background:#2f84c1}
input[type=submit]:active,button:active{padding:6px 10px 4px 10px;box-shadow:inset 0 2px 2px rgba(0,0,0,0.2);border-bottom:solid rgba(255,255,255,0.1) 1px} input[type=submit]:active,button:active{box-shadow:inset 0 2px 2px rgba(0,0,0,0.2);border-bottom:solid rgba(255,255,255,0.1) 1px}
#tools_left{position:absolute;border-right:0;width:50px;top:30px;left:0;background:#2f2f2c;z-index:4} #tools_left{position:absolute;border-right:0;width:50px;top:30px;left:0;background:#2f2f2c;z-index:4}
#workarea.wireframe #svgcontent *{fill:none;stroke:#000;stroke-width:1px;stroke-opacity:1.0;stroke-dasharray:0;opacity:1;pointer-events:stroke;vector-effect:non-scaling-stroke;filter:none} #workarea.wireframe #svgcontent *{fill:none;stroke:#000;stroke-width:1px;stroke-opacity:1.0;stroke-dasharray:0;opacity:1;pointer-events:stroke;vector-effect:non-scaling-stroke;filter:none}
#workarea.wireframe #svgcontent text{fill:#000;stroke:none} #workarea.wireframe #svgcontent text{fill:#000;stroke:none}

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

File diff suppressed because it is too large Load Diff

2
method-draw/temp.css
View File

@ -1360,7 +1360,7 @@ box-shadow: inset 0 3px 10px rgba(255, 255, 255, 0.1),
} }
input[type=submit]:hover, button:hover {background: #2F84C1;} input[type=submit]:hover, button:hover {background: #2F84C1;}
input[type=submit]:active, button:active {padding: 6px 10px 4px 10px; box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;} input[type=submit]:active, button:active { box-shadow: inset 0 2px 2px rgba(0,0,0,0.2); border-bottom: solid rgba(255,255,255,0.1) 1px;}
#tools_left { #tools_left {