diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/io | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/io')
55 files changed, 5489 insertions, 2767 deletions
diff --git a/js/io/document/base-document.js b/js/io/document/base-document.js deleted file mode 100644 index 44f54f78..00000000 --- a/js/io/document/base-document.js +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
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 | |||
7 | //BaseDocument Object for all files types and base class for HTML documents. | ||
8 | |||
9 | var Montage = require("montage/core/core").Montage; | ||
10 | |||
11 | var BaseDocument = exports.BaseDocument = Montage.create(Montage, { | ||
12 | /** Private Members **/ | ||
13 | _name: { value: null, enumerable: false }, | ||
14 | _uri: { value: null, enumerable: false }, | ||
15 | _documentType: { value: null, enumerable: false }, | ||
16 | _container: {value: null, enumerable: false }, | ||
17 | _uuid: { value: null, enumerable: false }, | ||
18 | _isActive: { value: true, enumerable: false }, | ||
19 | _dirtyFlag: { value: false, enumerable: false }, | ||
20 | _callback: { value: null, enumerable: false }, | ||
21 | _currentView: { value: null, enumerable: false}, | ||
22 | |||
23 | /** Getters/Setters **/ | ||
24 | name: { | ||
25 | get: function() { return this._name; }, | ||
26 | set: function(value) { this._name = value; } | ||
27 | }, | ||
28 | |||
29 | uri: { | ||
30 | get: function() { return this._uri; }, | ||
31 | set: function(value) { this._uri = value; } | ||
32 | }, | ||
33 | |||
34 | documentType: { | ||
35 | get: function() { return this._documentType; }, | ||
36 | set: function(value) { this._documentType = value; } | ||
37 | }, | ||
38 | |||
39 | container: { | ||
40 | get: function() { return this._container; }, | ||
41 | set: function(value) { this._container = value; } | ||
42 | }, | ||
43 | |||
44 | uuid: { | ||
45 | get: function() { return this._uuid; }, | ||
46 | set: function(value) { this._uuid = value; } | ||
47 | }, | ||
48 | |||
49 | isActive: { | ||
50 | get: function() { return this._isActive; }, | ||
51 | set: function(value) { this._isActive = value; } | ||
52 | }, | ||
53 | |||
54 | dirtyFlag: { | ||
55 | get: function() { return this._dirtyFlag; }, | ||
56 | set: function(value) { this._dirtyFlag = value; } | ||
57 | }, | ||
58 | |||
59 | callback: { | ||
60 | get: function() { return this._callback; }, | ||
61 | set: function(value) { this._callback = value; } | ||
62 | }, | ||
63 | |||
64 | currentView: { | ||
65 | get: function() { return this._currentView; }, | ||
66 | set: function(value) { this._currentView = value } | ||
67 | }, | ||
68 | |||
69 | /** Base Methods **/ | ||
70 | init: { | ||
71 | value: function(name, uri, type, container, uuid, callback) { | ||
72 | this.name = name; | ||
73 | this.uri = uri; | ||
74 | this.documentType = type; | ||
75 | this.container = container; | ||
76 | this.uuid = uuid; | ||
77 | this.callback = callback; | ||
78 | } | ||
79 | }, | ||
80 | |||
81 | loadDocument: { | ||
82 | value: function() { | ||
83 | // Have the XHR here? | ||
84 | } | ||
85 | } | ||
86 | |||
87 | |||
88 | }); \ No newline at end of file | ||
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js deleted file mode 100644 index 99177de0..00000000 --- a/js/io/document/document-controller.js +++ /dev/null | |||
@@ -1,326 +0,0 @@ | |||
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 | |||
7 | /** | ||
8 | @module js/document/documentManager | ||
9 | @requires montage/core/core | ||
10 | @requires montage/ui/component | ||
11 | @requires js/document/html-document | ||
12 | @requires js/document/text-document | ||
13 | */ | ||
14 | |||
15 | // TODO : Fix deps from Montage V4 Archi | ||
16 | |||
17 | var Montage = require("montage/core/core").Montage, | ||
18 | Component = require("montage/ui/component").Component, | ||
19 | Uuid = require("montage/core/uuid").Uuid; | ||
20 | |||
21 | var HTMLDocument = require("js/io/document/html-document").HTMLDocument; | ||
22 | var TextDocument = require("js/io/document/text-document").TextDocument; | ||
23 | |||
24 | var DocumentController = exports.DocumentController = Montage.create(Component, { | ||
25 | hasTemplate: { value: false }, | ||
26 | |||
27 | _documents: { value: [] }, | ||
28 | _documentsHash: { value: {} }, | ||
29 | _activeDocument: { value: null }, | ||
30 | _iframeCounter: { value: 1, enumerable: false }, | ||
31 | _iframeHolder: { value: null, enumerable: false }, | ||
32 | _textHolder: { value: null, enumerable: false }, | ||
33 | _codeMirrorCounter: {value: 1, enumerable: false}, | ||
34 | |||
35 | _codeEditor: { | ||
36 | value: { | ||
37 | "editor": { | ||
38 | value: null, | ||
39 | enumerable: false | ||
40 | }, | ||
41 | "hline": { | ||
42 |