Skip to content

Commit

Permalink
Merge pull request #131 from openeyes/feature/OE-8261
Browse files Browse the repository at this point in the history
OE-8261 Keratic precipitate (KP) doodle location is saved
  • Loading branch information
biskyt authored Apr 24, 2019
2 parents da7ae69 + 245421a commit 89b9802
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 255 deletions.
2 changes: 1 addition & 1 deletion assets/js/dist/eyedraw.js
Original file line number Diff line number Diff line change
Expand Up @@ -34072,7 +34072,7 @@ ED.KeraticPrecipitates = function(_drawing, _parameterJSON) {
this.className = "KeraticPrecipitates";

// Saved parameters
this.savedParameterArray = ['apexX', 'apexY', 'scaleX', 'scaleY'];
this.savedParameterArray = ['apexX', 'apexY', 'scaleX', 'scaleY', 'originX', 'originY'];

// Call superclass constructor
ED.Doodle.call(this, _drawing, _parameterJSON);
Expand Down
4 changes: 2 additions & 2 deletions assets/js/dist/eyedraw.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dist/oe-eyedraw.js
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ ED.Views.SelectedDoodle = (function() {

return SelectedDoodle;
}());
/*! Generated on 4/3/2019 */
/*! Generated on 15/3/2019 */
ED.scriptTemplates = {
"doodle-popup": "\n\n{{#doodle}}\n{{^doodle.isNode}}\n\t<ul class=\"ed-toolbar-panel ed-doodle-popup-toolbar\">\n\t\t<li>\n\t\t\t{{#desc}}\n\t\t\t\t<a class=\"ed-button ed-doodle-help{{lockedButtonClass}}\" href=\"#\" data-function=\"toggleHelp\">\n\t\t\t\t\t<span class=\"icon-ed-help\"></span>\n\t\t\t\t</a>\n\t\t\t{{/desc}}\n\t\t</li>\n\t\t{{#doodle.isLocked}}\n\t\t\t<li>\n\t\t\t\t<a class=\"ed-button\" href=\"#\" data-function=\"unlock\">\n\t\t\t\t\t<span class=\"icon-ed-unlock\"></span>\n\t\t\t\t\t<span class=\"label\">Unlock</span>\n\t\t\t\t</a>\n\t\t\t</li>\n\t\t{{/doodle.isLocked}}\n\t\t{{^doodle.isLocked}}\n\t\t\t<li>\n\t\t\t\t<a class=\"ed-button\" href=\"#\" data-function=\"lock\">\n\t\t\t\t\t<span class=\"icon-ed-lock\"></span>\n\t\t\t\t\t<span class=\"label\">Lock</span>\n\t\t\t\t</a>\n\t\t\t</li>\n\t\t{{/doodle.isLocked}}\n\t\t<li>\n\t\t\t<a class=\"ed-button{{lockedButtonClass}}\" href=\"#\" data-function=\"moveToBack\">\n\t\t\t\t<span class=\"icon-ed-move-to-back\"></span>\n\t\t\t\t<span class=\"label\">Move to back</span>\n\t\t\t</a>\n\t\t</li>\n\t\t<li>\n\t\t\t<a class=\"ed-button{{lockedButtonClass}}\" href=\"#\" data-function=\"moveToFront\">\n\t\t\t\t<span class=\"icon-ed-move-to-front\"></span>\n\t\t\t\t<span class=\"label\">Move to front</span>\n\t\t\t</a>\n\t\t</li>\n\t\t<li>\n\t\t\t{{#doodle.isDeletable}}\n\t\t\t\t<a class=\"ed-button{{lockedButtonClass}}\" href=\"#\" data-function=\"deleteSelectedDoodle\">\n\t\t\t\t\t<span class=\"icon-ed-delete\"></span>\n\t\t\t\t\t<span class=\"label\">Delete</span>\n\t\t\t\t</a>\n\t\t\t{{/doodle.isDeletable}}\n\t\t</li>\n\t</ul>\n\t<div class=\"ed-doodle-info\" style=\"display: none;\">\n\t\t{{^doodle.isLocked}}\n\t\t\t{{#desc}}\n\t\t\t\t<div class=\"ed-doodle-description\">{{{desc}}}</div>\n\t\t\t{{/desc}}\n\t\t{{/doodle.isLocked}}\n\t</div>\n\t<div class=\"ed-doodle-controls\" {{#doodle.isLocked}}style=\"display: none;\"{{/doodle.isLocked}} id=\"{{drawing.canvas.id}}_controls\">\n\t</div>\n\t{{/doodle.isNode}}\n\t{{#doodle.isLocked}}\n\t\t<div class=\"ed-doodle-description\">\n\t\t\t<strong>This doodle is locked and cannot be edited.</strong>\n\t\t</div>\n\t{{/doodle.isLocked}}\n{{/doodle}}"
};
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dist/oe-eyedraw.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 89b9802

Please sign in to comment.