aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-18 16:24:17 -0700
committerValerio Virgillito2012-07-18 16:24:17 -0700
commit5ae767d4d47d0ed6846c7928ec219a70c3706639 (patch)
tree63051c2c69d436799ce2673e8496360496565c06
parentc1360b71e30cff1d90d7a3476ff2878821534d39 (diff)
parent6f2e455a77179f81dfd19037c078c158d3e14ee2 (diff)
downloadninja-5ae767d4d47d0ed6846c7928ec219a70c3706639.tar.gz
Merge branch 'menu-fixes' of https://github.com/mencio/ninja into v0.7.1
-rwxr-xr-xcss/ninja.css2
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.css13
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html23
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js6
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.css49
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html55
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.js77
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.css4
-rw-r--r--js/controllers/clipboard-controller.js14
-rwxr-xr-xjs/data/menu-data.js582
-rwxr-xr-xjs/models/app-model.js156
-rwxr-xr-xjs/ninja.reel/ninja.html19
-rwxr-xr-xjs/ninja.reel/ninja.js5
-rw-r--r--js/ui/menu/menu-controller.js636
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.css (renamed from js/components/menu/menu-entry.reel/menu-entry.css)55
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.html (renamed from js/components/menu/menu-entry.reel/menu-entry.html)37
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.js (renamed from js/components/menu/menu-entry.reel/menu-entry.js)90
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.css (renamed from js/components/menu/menu-item.reel/menu-item.css)101
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.html (renamed from js/components/menu/menu-item.reel/menu-item.html)67
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.js (renamed from js/components/menu/menu-item.reel/menu-item.js)150
-rwxr-xr-xjs/ui/menu/menu.reel/menu.css (renamed from js/components/menu/menu.reel/menu.css)4
-rwxr-xr-xjs/ui/menu/menu.reel/menu.html (renamed from js/components/menu/menu.reel/menu.html)21
-rwxr-xr-xjs/ui/menu/menu.reel/menu.js (renamed from js/components/menu/menu.reel/menu.js)78
-rwxr-xr-xscss/imports/scss/_MainWindow.scss2
24 files changed, 1041 insertions, 1205 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 288156b6..bc82f50d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -98,7 +98,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
98 98
99#appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; } 99#appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; }
100 100
101#topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; } 101#topMenu { background-color: #474747; position: absolute; height: 26px; width: 100%; top: 0px; left: 0px; z-index: 6995; }
102 102
103#topPanelContainer, #leftPanelContainer, #rightPanelContainer, .timelinePanel { background-color: #282828; } 103#topPanelContainer, #leftPanelContainer, #rightPanelContainer, .timelinePanel { background-color: #282828; }
104 104
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index b86855b7..5eba72e8 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -75,7 +75,7 @@ POSSIBILITY OF SUCH DAMAGE.
75 padding: 0; 75 padding: 0;
76 border: none; 76 border: none;
77 color: #FFF; 77 color: #FFF;
78 width: 44px; 78 width: 46px;
79 text-transform: uppercase; 79 text-transform: uppercase;
80 text-align: left; 80 text-align: left;
81 float: left; 81 float: left;
@@ -83,6 +83,10 @@ POSSIBILITY OF SUCH DAMAGE.
83 font-size: 11px; 83 font-size: 11px;
84} 84}
85 85
86.preview:focus {
87 -webkit-box-shadow: none;
88}
89
86.documentBar .viewicon { 90.documentBar .viewicon {
87 background-repeat: no-repeat; 91 background-repeat: no-repeat;
88 background-position: center center; 92 background-position: center center;
@@ -98,10 +102,15 @@ POSSIBILITY OF SUCH DAMAGE.
98} 102}
99 103
100.documentBar .viewdesign { 104.documentBar .viewdesign {
101 background-image: url('../../../../js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png'); 105 background-image: url('../../../../js/panels/color/colorpanelpopup.reel/img/icon_bitmap.png');
102 background-size: 90%; 106 background-size: 90%;
103} 107}
104 108
109.documentBar .viewPreview {
110 background-image: url('../../../../images/optionsbar/edit_mode.png');
111 background-size: 100%;
112}
113
105.documentBar section.inactive .viewicon{ 114.documentBar section.inactive .viewicon{
106 opacity: .5; 115 opacity: .5;
107} 116}
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 69f8107f..9e5e4eb2 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -68,6 +68,21 @@ POSSIBILITY OF SUCH DAMAGE.
68 "condition": {"<-": "@owner.disabled"} 68 "condition": {"<-": "@owner.disabled"}
69 } 69 }
70 }, 70 },
71
72 "menuItemButton": {
73 "prototype": "montage/ui/native/button.reel",
74 "properties": {
75 "element": {"#": "previewButton"},
76 "identifier": "preview",
77 "label": "Preview"
78 },
79 "listeners": [
80 {
81 "type": "action",
82 "listener": {"@": "owner"}
83 }
84 ]
85 },
71 86
72 "owner": { 87 "owner": {
73 "prototype": "js/components/layout/document-bar.reel", 88 "prototype": "js/components/layout/document-bar.reel",
@@ -108,6 +123,14 @@ POSSIBILITY OF SUCH DAMAGE.
108 <button class="btn_view">Code</button> 123 <button class="btn_view">Code</button>
109 124
110 </section> 125 </section>
126
127 <section class="inactive">
128
129 <div class="viewicon viewPreview"></div>
130
131 <button data-montage-id="previewButton" class="btn_view preview"></button>
132
133 </section>
111 134
112 <div data-montage-id="disabledCondition" class="panelDisabled"></div> 135 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
113 136
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 248bc8c4..fa0c8788 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -203,5 +203,11 @@ exports.DocumentBar = Montage.create(Component, {
203 this.currentView = event._event.target.id; 203 this.currentView = event._event.target.id;
204 this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view 204 this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view
205 } 205 }
206 },
207
208 handlePreviewAction: {
209 value: function(event) {
210 NJevent("executePreview");
211 }
206 } 212 }
207}); 213});
diff --git a/js/components/layout/stage-mode.reel/stage-mode.css b/js/components/layout/stage-mode.reel/stage-mode.css
deleted file mode 100755
index c50679e8..00000000
--- a/js/components/layout/stage-mode.reel/stage-mode.css
+++ /dev/null
@@ -1,49 +0,0 @@
1/* <copyright>
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
8* Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer.
10
11* Redistributions in binary form must reproduce the above copyright notice,
12 this list of conditions and the following disclaimer in the documentation
13 and/or other materials provided with the distribution.
14
15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
18
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */
31
32.stageMode {
33 width:26px;
34 height:23px;
35 position:absolute;
36 top:5px;
37 right:60px;
38
39 opacity: 0.7;
40 background-repeat:no-repeat;
41}
42
43.editMode {
44 background-image: url('../../../../images/optionsbar/edit_mode.png');
45}
46
47.liveMode {
48 background-image: url('../../../../images/optionsbar/live_mode.png');
49}
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
deleted file mode 100755
index fb6a26b0..00000000
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ /dev/null
@@ -1,55 +0,0 @@
1<!DOCTYPE html>