diff options
Diffstat (limited to 'js/components')
8 files changed, 226 insertions, 342 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js index f35a1fff..6e239f7d 100755 --- a/js/components/gradientpicker.reel/gradientpicker.js +++ b/js/components/gradientpicker.reel/gradientpicker.js | |||
@@ -172,6 +172,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
172 | //Storing refereces to buttons and actual stop container | 172 | //Storing refereces to buttons and actual stop container |
173 | button.stop = stop; | 173 | button.stop = stop; |
174 | tooltip.stop = stop; | 174 | tooltip.stop = stop; |
175 | holder.stop = stop; | ||
175 | stop.button = button; | 176 | stop.button = button; |
176 | //Adding stop to container | 177 | //Adding stop to container |
177 | this.trackChips.appendChild(stop); | 178 | this.trackChips.appendChild(stop); |
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js index 17f847d4..6c49af8f 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.js +++ b/js/components/menu/menu-entry.reel/menu-entry.js | |||
@@ -102,10 +102,21 @@ exports.MenuEntry = Montage.create(Component, { | |||
102 | } | 102 | } |
103 | }, | 103 | }, |
104 | 104 | ||
105 | toggleOnMenuItemAction: { | ||
106 | value: function() { | ||
107 | // TODO: Hack! Rework this! | ||
108 | //for non menu headers only | ||
109 | this.parentComponent.ownerComponent.toggleActivation(this); | ||
110 | } | ||
111 | }, | ||
112 | |||
105 | captureMousedown: { | 113 | captureMousedown: { |
106 | value: function(event) { | 114 | value: function(event) { |
107 | // TODO: Hack! Rework this! | 115 | // TODO: Hack! Rework this! |
108 | this.parentComponent.ownerComponent.toggleActivation(this); | 116 | //for menu headers only |
117 | if(event.target.getAttribute("data-montage-id") === "topHeaderText"){ | ||
118 | this.parentComponent.ownerComponent.toggleActivation(this); | ||
119 | } | ||
109 | } | 120 | } |
110 | }, | 121 | }, |
111 | 122 | ||
diff --git a/js/components/menu/menu-item.reel/menu-item.css b/js/components/menu/menu-item.reel/menu-item.css index 298d706d..59f04675 100755 --- a/js/components/menu/menu-item.reel/menu-item.css +++ b/js/components/menu/menu-item.reel/menu-item.css | |||
@@ -33,10 +33,12 @@ POSSIBILITY OF SUCH DAMAGE. | |||
33 | font-size: 10pt; | 33 | font-size: 10pt; |
34 | padding: 3px 12px 3px 8px; | 34 | padding: 3px 12px 3px 8px; |
35 | text-shadow : 1px 1px 1px #000000; | 35 | text-shadow : 1px 1px 1px #000000; |
36 | cursor:pointer; | ||
36 | } | 37 | } |
37 | 38 | ||
38 | .menuItem:hover { | 39 | .menuItem:hover { |
39 | background-color: #7f7f7f; | 40 | background-color: #7f7f7f; |
41 | cursor:pointer; | ||
40 | } | 42 | } |
41 | 43 | ||
42 | .menubg .subEntries { | 44 | .menubg .subEntries { |
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js index 320611c5..fbac149c 100755 --- a/js/components/menu/menu-item.reel/menu-item.js +++ b/js/components/menu/menu-item.reel/menu-item.js | |||
@@ -120,18 +120,15 @@ exports.MenuItem = Montage.create(Component, { | |||
120 | 120 | ||
121 | if(this.data.submenu) { | 121 | if(this.data.submenu) { |
122 | this.submenu = true; | 122 | this.submenu = true; |
123 | |||
124 | this.subentries = this.data.entries; | 123 | this.subentries = this.data.entries; |
125 | |||
126 | this.subMenu.classList.add("subMenu"); | 124 | this.subMenu.classList.add("subMenu"); |
127 | this.element.addEventListener("mouseover", this, false); | ||
128 | this.element.addEventListener("mouseout", this, false); | ||
129 | |||
130 | } | 125 | } |
131 | 126 | ||
127 | this.element.addEventListener("mouseover", this, false); | ||
128 | this.element.addEventListener("mouseout", this, false); | ||
132 | 129 | ||
133 | this.itemText.innerHTML = this.data.displayText; | 130 | this.itemText.innerHTML = this.data.displayText; |
134 | this.element.addEventListener("mousedown", this, true); | 131 | this.element.addEventListener("mouseup", this, true); |
135 | } | 132 | } |
136 | }, | 133 | }, |
137 | 134 | ||
@@ -156,10 +153,13 @@ exports.MenuItem = Montage.create(Component, { | |||
156 | } | 153 | } |
157 | }, | 154 | }, |
158 | 155 | ||
159 | captureMousedown: { | 156 | captureMouseup: { |
160 | value: function(event) { | 157 | value: function(event) { |
161 | 158 | ||
162 | if(this.data.radio && this.checked) return; | 159 | if(this.data.radio && this.checked){ |
160 | this.parentComponent.ownerComponent.toggleOnMenuItemAction(); | ||
161 | return; | ||
162 | } | ||
163 | 163 | ||
164 | if( ( this.enabled === true || this.enabled > 0 ) && (this.submenu === false) ) { | 164 | if( ( this.enabled === true || this.enabled > 0 ) && (this.submenu === false) ) { |
165 | if(this.data.action) { | 165 | if(this.data.action) { |
@@ -167,6 +167,7 @@ exports.MenuItem = Montage.create(Component, { | |||
167 | } else if(this.checked !== null) { | 167 | } else if(this.checked !== null) { |
168 | this.checked = !this.checked; | 168 | this.checked = !this.checked; |
169 | } | 169 | } |
170 | this.parentComponent.ownerComponent.toggleOnMenuItemAction(); | ||
170 | } | 171 | } |
171 | 172 | ||
172 | } | 173 | } |
@@ -174,13 +175,22 @@ exports.MenuItem = Montage.create(Component, { | |||
174 | 175 | ||
175 | handleMouseover: { | 176 | handleMouseover: { |
176 | value: function() { | 177 | value: function() { |
177 | if(this.enabled) this.subMenu.style.display = "block"; | 178 | if(this.enabled){ |
179 | this.element.style.backgroundColor = "#7f7f7f"; | ||
180 | this.element.style.cursor = "pointer"; | ||
181 | if(this.data.submenu) { | ||
182 | this.subMenu.style.display = "block"; | ||
183 | } | ||
184 | } | ||
178 | } | 185 | } |
179 | }, | 186 | }, |
180 | 187 | ||
181 | handleMouseout: { | 188 | handleMouseout: { |
182 | value: function() { | 189 | value: function() { |
183 | this.subMenu.style.display = "none"; | 190 | this.element.style.backgroundColor = "#474747"; |
191 | if(this.data.submenu) { | ||
192 | this.subMenu.style.display = "none"; | ||
193 | } | ||
184 | } | 194 | } |
185 | } | 195 | } |
186 | 196 | ||
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css index 60317304..9e562f68 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css | |||
@@ -63,6 +63,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
63 | width: 160px; | 63 | width: 160px; |
64 | } | 64 | } |
65 | 65 | ||
66 | .optionsTextTool .montage-button:hover { | ||
67 | color:#FFF; | ||
68 | } | ||
69 | |||
66 | .fontColorChipContainer { | 70 | .fontColorChipContainer { |
67 | margin-left: 10px !important; | 71 | margin-left: 10px !important; |
68 | margin-right: 0px; | 72 | margin-right: 0px; |
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index b4a0f1ae..89659477 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -35,77 +35,85 @@ POSSIBILITY OF SUCH DAMAGE. | |||
35 | 35 | ||
36 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
37 | { | 37 | { |
38 | |||
39 | "owner": { | 38 | "owner": { |
40 | "prototype": "js/components/tools-properties/text-properties.reel", | 39 | "prototype": "js/components/tools-properties/text-properties.reel", |
41 | "properties": { | 40 | "properties": { |
42 | "element": {"#": "textProperties"}, | 41 | "element": {"#": "textProperties"}, |
43 | "className": {"@": "className"}, | 42 | |
44 | "tagType": {"@": "tagType"}, | 43 | "fontName": {"@": "fontname"}, |
45 | "fontSelection": {"@": "fontSelection"}, | 44 | "fontSize": {"@": "fontsize"}, |
46 | "fontSettings": {"@": "fontSettings"}, | ||
47 | "fontSize": {"@": "fontSize"}, | ||
48 | "fontColor": {"#": "fontColorCtrl"}, | 45 | "fontColor": {"#": "fontColorCtrl"}, |
46 | |||
49 | "btnBold": {"@": "btnBold"}, | 47 | "btnBold": {"@": "btnBold"}, |
50 | "btnItalic": {"@": "btnItalic"}, | 48 | "btnItalic": {"@": "btnItalic"}, |
51 | "btnUnderline": {"@": "btnUnderline"}, | 49 | "btnUnderline": {"@": "btnUnderline"}, |
52 | "btnStrikethrough": {"@": "btnStrikethrough"}, | 50 | "btnStrikethrough": {"@": "btnStrikethrough"}, |
51 | |||
53 | "alignLeft": {"@": "alignLeft"}, | 52 | "alignLeft": {"@": "alignLeft"}, |
54 | "alignCenter": {"@": "alignCenter"}, | 53 | "alignCenter": {"@": "alignCenter"}, |
55 | "alignRight": {"@": "alignRight"}, | 54 | "alignRight": {"@": "alignRight"}, |
56 | "alignJustify": {"@": "alignJustify"}, | 55 | "alignJustify": {"@": "alignJustify"}, |
56 | |||