Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
This commit is contained in:
commit
b5b7f9c146
|
@ -1,4 +1,4 @@
|
||||||
body {
|
body {
|
||||||
background: #D8D8D8;
|
background: #D8D8D8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -410,6 +410,7 @@
|
||||||
#svg_editor #line_panel,
|
#svg_editor #line_panel,
|
||||||
#svg_editor #image_panel,
|
#svg_editor #image_panel,
|
||||||
#svg_editor #text_panel,
|
#svg_editor #text_panel,
|
||||||
|
#svg_editor #foreignObject_panel,
|
||||||
#svg_editor #path_node_panel {
|
#svg_editor #path_node_panel {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -772,7 +772,7 @@ function svg_edit_setup() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Elements in this array cannot be converted to a path
|
// Elements in this array cannot be converted to a path
|
||||||
var no_path = $.inArray(elname, ['image', 'text', 'path', 'g', 'use']) == -1;
|
var no_path = $.inArray(elname, ['image', 'text', 'path', 'g', 'use', 'foreignObject']) == -1;
|
||||||
$('#tool_topath').toggle(no_path);
|
$('#tool_topath').toggle(no_path);
|
||||||
$('#tool_reorient').toggle(elname == 'path');
|
$('#tool_reorient').toggle(elname == 'path');
|
||||||
$('#tool_reorient').toggleClass('disabled', angle == 0);
|
$('#tool_reorient').toggleClass('disabled', angle == 0);
|
||||||
|
|
Loading…
Reference in a new issue