aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.css2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js9
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js22
3 files changed, 1 insertions, 32 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css
index 6a2900be..87880b8d 100755
--- a/js/components/layout/document-entry.reel/document-entry.css
+++ b/js/components/layout/document-entry.reel/document-entry.css
@@ -42,7 +42,7 @@
42 background-color:#7F7F7F; 42 background-color:#7F7F7F;
43} 43}
44 44
45.documentEntry img:hover { 45.documentEntry button:hover {
46 opacity: 1.0; /* 100% */ 46 opacity: 1.0; /* 100% */
47} 47}
48 48
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index 638aea41..c46c065e 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -64,18 +64,9 @@ exports.ToolsList = Montage.create(Component, {
64 } 64 }
65 }, 65 },
66 66
67 handleCloseDocument: {
68 value: function(){
69 if(!this.application.ninja.documentController.activeDocument) {
70 this.disabled = true;
71 }
72 }
73 },
74
75 prepareForDraw: { 67 prepareForDraw: {
76 enumerable: false, 68 enumerable: false,
77 value: function() { 69 value: function() {
78 this.eventManager.addEventListener( "closeDocument", this, false);
79 this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties; 70 this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties;
80 71
81 this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties; 72 this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties;
diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js
index c25559ae..6ea4ad85 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.js
+++ b/js/components/layout/tools-properties.reel/tools-properties.js
@@ -46,28 +46,6 @@ exports.ToolsProperties = Montage.create(Component, {
46 } 46 }
47 }, 47 },
48 48
49 handleCloseDocument: {
50 value: function(){
51 if(!this.application.ninja.documentController.activeDocument) {
52 this.disabled = true;
53 }
54 }
55 },
56
57 prepareForDraw: {
58 enumerable: false,
59 value: function() {
60 this.eventManager.addEventListener( "closeDocument", this, false);
61 }
62 },
63
64 draw: {
65 enumerable: false,
66 value: function() {
67 //this.selectionProperties.needsDraw = true;
68 }
69 },
70
71 _currentSelectedTool : { 49 _currentSelectedTool : {
72 value: null 50 value: null
73 }, 51 },