aboutsummaryrefslogtreecommitdiff
path: root/js/panels/history-panel/history.reel
diff options
context:
space:
mode:
authorhwc4872012-04-19 13:01:43 -0700
committerhwc4872012-04-19 13:01:43 -0700
commite6a20fe64574763483dc602bd759278ccf5e5e68 (patch)
tree69defe7200206f0257fe90697136fadef59d521e /js/panels/history-panel/history.reel
parentae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff)
parent9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff)
downloadninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'js/panels/history-panel/history.reel')
-rw-r--r--js/panels/history-panel/history.reel/history.css34
-rw-r--r--js/panels/history-panel/history.reel/history.html106
-rw-r--r--js/panels/history-panel/history.reel/history.js26
3 files changed, 166 insertions, 0 deletions
diff --git a/js/panels/history-panel/history.reel/history.css b/js/panels/history-panel/history.reel/history.css
new file mode 100644
index 00000000..44c4c74b
--- /dev/null
+++ b/js/panels/history-panel/history.reel/history.css
@@ -0,0 +1,34 @@
1.history_panel {
2 height: 100%;
3 overflow: hidden;
4}
5
6.scroller {
7 position: absolute;
8 top: 0;
9 left: 0;
10 right: 0;
11 bottom: 0;
12}
13
14.history_panel ul {
15 padding: 0;
16 margin: 0;
17}
18
19.history_panel li {
20 padding: 10px 15px;
21 list-style: none;
22}
23
24.undo_list li {
25 background-color: hsl(0, 0%, 94%);
26 border-top: 1px solid hsl(0, 0%, 100%);
27 border-bottom: 1px solid hsl(0, 0%, 85%);
28}
29
30.redo_list li {
31 background-color: hsl(199, 71%, 79%);
32 border-top: 1px solid hsl(0, 0%, 100%);
33 border-bottom: 1px solid hsl(0, 0%, 85%);
34} \ No newline at end of file
diff --git a/js/panels/history-panel/history.reel/history.html b/js/panels/history-panel/history.reel/history.html
new file mode 100644
index 00000000..f2e3c6ae
--- /dev/null
+++ b/js/panels/history-panel/history.reel/history.html
@@ -0,0 +1,106 @@
1<!DOCTYPE html>
2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> -->
7<html lang="en">
8 <head>
9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
10 <link rel="stylesheet" type="text/css" href="history.css">
11
12 <script type="text/montage-serialization">
13 {
14 "owner": {
15 "prototype": "js/panels/history-panel/history.reel",
16 "properties": {
17 "element": {"#": "history_panel"}
18 }
19 },
20
21 "defaultUndoManager": {
22 "object": "montage/core/undo-manager"
23 },
24
25 "scroller": {
26 "prototype": "montage/ui/scroller.reel",
27 "properties": {
28 "element": {"#": "scroller"},
29 "axis": "vertical"
30 }
31 },
32
33 "undoList": {
34 "prototype": "montage/ui/repetition.reel",
35 "properties": {
36 "element": {"#": "undo_list"}
37 },
38 "bindings": {
39 "objects": {
40 "boundObject": {"@": "defaultUndoManager"},
41 "boundObjectPropertyPath": "undoStack",
42 "oneway": true
43 }
44 }
45 },
46
47 "undoItem": {
48 "prototype": "js/panels/history-panel/history-item.reel",
49 "properties": {
50 "element": {"#": "undo_item"}
51 },
52 "bindings": {
53 "title": {
54 "boundObject": {"@": "undoList"},
55 "boundObjectPropertyPath": "objectAtCurrentIteration.label",
56 "oneway": true
57 }
58 }
59 },
60
61 "redoList": {
62 "prototype": "montage/ui/repetition.reel",
63 "properties": {
64 "element": {"#": "redo_list"}
65 },
66 "bindings": {
67 "objects": {
68 "boundObject": {"@": "defaultUndoManager"},
69 "boundObjectPropertyPath": "redoStack",
70 "oneway": true
71 }
72 }
73 },
74
75 "redoItem": {
76 "prototype": "js/panels/history-panel/history-item.reel",
77 "properties": {
78 "element": {"#": "redo_item"}
79 },
80 "bindings": {
81 "title": {
82 "boundObject": {"@": "redoList"},
83 "boundObjectPropertyPath": "objectAtCurrentIteration.label",
84 "oneway": true
85 }
86 }
87 }
88 }
89 </script>
90
91 </head>
92 <body>
93
94 <div data-montage-id="history_panel" class="history_panel">
95 <div data-montage-id="scroller" class="scroller">
96 <ul data-montage-id="undo_list" class="undo_list">
97 <li data-montage-id="undo_item"></li>
98 </ul>
99 <ul data-montage-id="redo_list" class="redo_list">
100 <li data-montage-id="redo_item"></li>
101 </ul>
102 </div>
103 </div>
104
105 </body>
106</html> \ No newline at end of file
diff --git a/js/panels/history-panel/history.reel/history.js b/js/panels/history-panel/history.reel/history.js
new file mode 100644
index 00000000..241286fb
--- /dev/null
+++ b/js/panels/history-panel/history.reel/history.js
@@ -0,0 +1,26 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component;
9
10exports.History = Montage.create(Component, {
11 historyList: {
12 value: null
13 },
14
15 didCreate: {
16 value: function() {
17 }
18 },
19
20 templateDidLoad: {
21 value: function() {
22 }
23 }
24
25
26}); \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 12:18:00 +0000