Gitlab CSE Unil

Commit c17ccead authored by Julien Furrer's avatar Julien Furrer
Browse files

bu

parent 83fa9e62
...@@ -609,6 +609,8 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export ...@@ -609,6 +609,8 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
.removeClass("adim-view-review adim-view-edit") .removeClass("adim-view-review adim-view-edit")
.addClass("adim-view-" + mode); .addClass("adim-view-" + mode);
config.mode = mode;
updateReservedSpace(); updateReservedSpace();
adjustCanvasToImage(); adjustCanvasToImage();
...@@ -1289,8 +1291,11 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export ...@@ -1289,8 +1291,11 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
el: "#prop-annot-comment", el: "#prop-annot-comment",
enable: function(status) { enable: function(status) {
status = (status !== void(0)) ? !!status : true; status = (status !== void(0)) ? !!status : true;
if (config.mode !== config.MODE_EDIT) //if (config.mode !== config.MODE_EDIT)
if ((config.mode === 'review') ||
(config.annotable && config.annotable.locked))
status = false; status = false;
if (status) { if (status) {
this.el.removeAttr("disabled"); this.el.removeAttr("disabled");
} else { } else {
......
...@@ -994,6 +994,7 @@ canvas { ...@@ -994,6 +994,7 @@ canvas {
resize: vertical; resize: vertical;
padding: 3px 3px 3px 6px; padding: 3px 3px 3px 6px;
line-height: 1.2em; line-height: 1.2em;
font-size: 12px;
} }
#annotation-property-container .property-group.comment-prop textarea[disabled] { #annotation-property-container .property-group.comment-prop textarea[disabled] {
background-color: #bcbcbc; background-color: #bcbcbc;
......
...@@ -1040,6 +1040,7 @@ canvas { ...@@ -1040,6 +1040,7 @@ canvas {
resize: vertical; resize: vertical;
padding: 3px 3px 3px 6px; padding: 3px 3px 3px 6px;
line-height: 1.2em; line-height: 1.2em;
font-size: 12px;
&[disabled] { &[disabled] {
background-color: lighten(@panel-dark-bg, 30%); background-color: lighten(@panel-dark-bg, 30%);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment