diff options
47 files changed, 1079 insertions, 589 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> */ | ||
6 | var Montage = require("montage").Montage, | ||
7 | Converter = require("montage/core/converter/converter").Converter, | ||
8 | NJUtils = require("js/lib/NJUtils").NJUtils; | ||
9 | |||
10 | exports.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> */ | ||
6 | var Montage = require("montage").Montage, | ||
7 | Converter = require("montage/core/converter/converter").Converter, | ||
8 | NJUtils = require("js/lib/NJUtils").NJUtils; | ||
9 | |||
10 | exports.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..81a63c90 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 | |||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | //var documentManagerModule = ("js/document/documentManager"); | ||
11 | |||
12 | exports.DocumentEntry = Montage.create(Component, { | 10 | exports.DocumentEntry = Montage.create(Component, { |
13 | 11 | ||
14 | dirty: { value: null }, | 12 | dirty: { value: null }, |
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html index cf3dbbf5..304c8871 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.html +++ b/js/components/layout/documents-tab.reel/documents-tab.html | |||
@@ -26,26 +26,10 @@ | |||
26 | "element": {"#": "document"} | 26 | "element": {"#": "document"} |
27 | }, | 27 | }, |
28 | "bindings": { | 28 | "bindings": { |
29 | "document": { | 29 | "document": {"<-": "@repetition1.objectAtCurrentIteration"}, |
30 | "boundObject": {"@": "repetition1"}, | 30 | "name": {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"}, |
31 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 31 | "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}, |
32 | "oneway": true | 32 | "active": {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"} |
33 | }, | ||
34 | "name": { | ||
35 | "boundObject": {"@": "repetition1"}, | ||
36 | "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name", | ||
37 | "oneway": true | ||
38 | }, | ||
39 | "saveFlag": { | ||
40 | "boundObject": {"@": "repetition1"}, | ||
41 | "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave", | ||
42 | "oneway": true | ||
43 | }, | ||
44 | "active": { | ||
45 | "boundObject": {"@": "repetition1"}, | ||
46 | "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive", | ||
47 | "oneway": true | ||
48 | } | ||
49 | } | 33 | } |
50 | }, | 34 | }, |
51 | 35 | ||
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 2be2e214..48ceb21b 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -88,18 +88,21 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
88 | 88 | ||
89 | 89 | ||
90 | 90 | ||
91 | 91 | //TODO: Ensure these APIs are not needed | |
92 | //////////////////////////////////////////////////////////////////// | 92 | //////////////////////////////////////////////////////////////////// |
93 | // | 93 | // |
94 | handleWebRequest: { | 94 | handleWebRequest: { |
95 | value: function (request) { | 95 | value: function (request) { |
96 | //TODO: Check if frameId is proper | 96 | //TODO: Check if frameId is proper |
97 | if (this._hackRootFlag && request.parentFrameId !== -1) { | 97 | if (this._hackRootFlag && request.parentFrameId !== -1) { |
98 | //TODO: Optimize creating string | 98 | //Checking for proper URL redirect (from different directories) |
99 |