aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 00:54:40 -0700
committerValerio Virgillito2012-05-16 00:54:40 -0700
commita9672abd32c2e03b8607c1af4903c90f7ff9531c (patch)
tree30da60ed624d3d60b09fc04672c502bbed3b11f8 /js/components
parent6dfe2e62b1d7a71daf097aac3a31213d564e6122 (diff)
parent2b21e91a3343229bb87179e08be1e532fcf9b8f9 (diff)
downloadninja-a9672abd32c2e03b8607c1af4903c90f7ff9531c.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
Diffstat (limited to 'js/components')
-rw-r--r--js/components/converter/string-units-converter.js31
-rw-r--r--js/components/converter/string-value-converter.js29
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js4
3 files changed, 61 insertions, 3 deletions
diff --git a/js/components/converter/string-units-converter.js b/js/components/converter/string-units-converter.js
new file mode 100644
index 00000000..6b97d5c5
--- /dev/null
+++ b/js/components/converter/string-units-converter.js
@@ -0,0 +1,31 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No 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> */
6var Montage = require("montage").Montage,
7 Converter = require("montage/core/converter/converter").Converter,
8 NJUtils = require("js/lib/NJUtils").NJUtils;
9
10exports.StringUnitsConverter = Montage.create(Converter, {
11
12 // convert fahrenheit to celsius (showing our non-metric heritage here)
13 convert: {
14 value: function(value) {
15 if(value) {
16 console.log("convert string to unit ", value);
17 var tmp = NJUtils.getValueAndUnits(value);
18 return tmp[1];
19 }
20 }
21 },
22
23 // revert celsius to fahrenheit
24 revert: {
25 value: function(value) {
26 console.log("revert string to unit ", value);
27 return value;
28 }
29 }
30
31});
diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js
new file mode 100644
index 00000000..28d7dd29
--- /dev/null
+++ b/js/components/converter/string-value-converter.js
@@ -0,0 +1,29 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No 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> */
6var Montage = require("montage").Montage,
7 Converter = require("montage/core/converter/converter").Converter,
8 NJUtils = require("js/lib/NJUtils").NJUtils;
9
10exports.StringValueConverter = Montage.create(Converter, {
11
12 // convert fahrenheit to celsius (showing our non-metric heritage here)
13 convert: {
14 value: function(value) {
15 console.log(value);
16 console.log(parseInt(value));
17 return parseInt(value);
18 }
19 },
20
21 // revert celsius to fahrenheit
22 revert: {
23 value: function(value) {
24 console.log("revert string to value ", value);
25 return value;
26 }
27 }
28
29});
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 9e4110e2..4d09a362 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -7,8 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10//var documentManagerModule = ("js/document/documentManager");
11
12exports.DocumentEntry = Montage.create(Component, { 10exports.DocumentEntry = Montage.create(Component, {
13 11
14 dirty: { value: null }, 12 dirty: { value: null },
@@ -119,7 +117,7 @@ exports.DocumentEntry = Montage.create(Component, {
119 handleClick: { 117 handleClick: {
120 value: function(event) { 118 value: function(event) {
121 if(event._event.target.nodeName === "IMG") { 119 if(event._event.target.nodeName === "IMG") {
122 this.application.ninja.documentController.closeDocument(this._uuid); 120 this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
123 } else { 121 } else {
124 if(!this._document.isActive) { 122 if(!this._document.isActive) {
125 this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); 123 this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid));