diff options
-rw-r--r-- | js/components/prompt.reel/prompt.js | 73 | ||||
-rwxr-xr-x | js/document/document-html.js | 6 | ||||
-rwxr-xr-x | js/document/models/base.js | 66 | ||||
-rwxr-xr-x | js/models/element-model.js | 4 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 4 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 66 |
6 files changed, 189 insertions, 30 deletions
diff --git a/js/components/prompt.reel/prompt.js b/js/components/prompt.reel/prompt.js new file mode 100644 index 00000000..652d7b7e --- /dev/null +++ b/js/components/prompt.reel/prompt.js | |||
@@ -0,0 +1,73 @@ | |||
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 | // | ||
9 | var Montage = require("montage/core/core").Montage, | ||
10 | Component = require("montage/ui/component").Component; | ||
11 | //////////////////////////////////////////////////////////////////////// | ||
12 | // | ||
13 | exports.NinjaPrompt = Montage.create(Component, { | ||
14 | //////////////////////////////////////////////////////////////////// | ||
15 | //TODO: This should have an UI template eventually | ||
16 | hasTemplate: { | ||
17 | value: false | ||
18 | }, | ||
19 | //////////////////////////////////////////////////////////////////// | ||
20 | //Type of prompt window (should be confirm, prompt, alert, or input) | ||
21 | _type: { | ||
22 | value: null | ||
23 | }, | ||
24 | //////////////////////////////////////////////////////////////////// | ||
25 | // | ||
26 | _params: { | ||
27 | value: null | ||
28 | }, | ||
29 | //////////////////////////////////////////////////////////////////// | ||
30 | // | ||
31 | _callback: { | ||
32 | value: null | ||
33 | }, | ||
34 | //////////////////////////////////////////////////////////////////// | ||
35 | // | ||
36 | initialize: { | ||
37 | value: function (type, params, callback) { | ||
38 | // | ||
39 | this._type = type.toLowerCase(); | ||
40 | this._params = params; | ||
41 | this._callback = callback; | ||
42 | } | ||
43 | }, | ||
44 | //////////////////////////////////////////////////////////////////// | ||
45 | // | ||
46 | show: { | ||
47 | value: function () { | ||
48 | // | ||
49 | var input; | ||
50 | // | ||
51 | switch (this._type) { | ||
52 | case 'confirm': | ||
53 | input = confirm(this._params.message); | ||
54 | if (this._callback) this._callback(input); | ||
55 | break; | ||
56 | default: | ||
57 | //TODO: Add support for other standard box types | ||
58 | break; | ||
59 | } | ||
60 | } | ||
61 | }, | ||
62 | //////////////////////////////////////////////////////////////////// | ||
63 | //This is for later, need to hide if need (overwrite) | ||
64 | hide: { | ||
65 | value: function () { | ||
66 | //TODO: Add support as real UI component | ||
67 | } | ||
68 | } | ||
69 | //////////////////////////////////////////////////////////////////// | ||
70 | //////////////////////////////////////////////////////////////////// | ||
71 | }); | ||
72 | //////////////////////////////////////////////////////////////////////// | ||
73 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | ||
diff --git a/js/document/document-html.js b/js/document/document-html.js index 15f88d09..aded9241 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -121,10 +121,8 @@ exports.HtmlDocument = Montage.create(Component, { | |||
121 | // | 121 | // |
122 | closeDocument: { | 122 | closeDocument: { |
123 | value: function (context, callback) { | 123 | value: function (context, callback) { |
124 | //Closing document and getting outcome | 124 | //Closing document (sending null to close all views) |
125 | var closed = this.model.close(null); | 125 | this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this)); |
126 | //Making callback if specified | ||
127 | if (callback) callback.call(context, this); | ||
128 | } | 126 | } |
129 | }, | 127 | }, |
130 | //////////////////////////////////////////////////////////////////// | 128 | //////////////////////////////////////////////////////////////////// |
diff --git a/js/document/models/base.js b/js/document/models/base.js index 1307e0c0..8ff52132 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||
@@ -6,8 +6,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | 6 | ||
7 | //////////////////////////////////////////////////////////////////////// | 7 | //////////////////////////////////////////////////////////////////////// |
8 | // | 8 | // |
9 | var Montage = require("montage/core/core").Montage, | 9 | var Montage = require("montage/core/core").Montage, |
10 | Component = require("montage/ui/component").Component; | 10 | Component = require("montage/ui/component").Component, |
11 | NinjaPrompt = require("js/components/prompt.reel").NinjaPrompt; | ||
11 | //////////////////////////////////////////////////////////////////////// | 12 | //////////////////////////////////////////////////////////////////////// |
12 | // | 13 | // |
13 | exports.BaseDocumentModel = Montage.create(Component, { | 14 | exports.BaseDocumentModel = Montage.create(Component, { |
@@ -267,30 +268,59 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
267 | if (this.callback) this.callback(result); | 268 | if (this.callback) this.callback(result); |
268 | } | 269 | } |
269 | }, | 270 | }, |
271 | //////////////////////////////////////////////////////////////////// | ||
272 | // | ||
273 | handleSavePrompt: { | ||
274 | value: function (continueToClose, callback) { | ||
275 | //TODO: Perhaps add logic to save the file is the user wants | ||
276 | if (continueToClose) { | ||
277 | if (callback) callback(); | ||
278 | } else { | ||
279 | //User canceled | ||
280 | //this.saveAll(null, callback); | ||
281 | } | ||
282 | } | ||
283 | }, | ||
270 | //////////////////////////////////////////////////////////////////// | 284 | //////////////////////////////////////////////////////////////////// |
271 | //TODO: Implement better logic to include different views on single document | 285 | //TODO: Implement better logic to include different views on single document |
272 | close: { | 286 | close: { |
273 | value: function (view, callback) { | 287 | value: function (view, callback) { |
274 | //Outcome of close (pending on save logic) | 288 | //Checking if files needs to be saved to avoid losing data |
275 | var success; | ||
276 | // | ||
277 | if (this.needsSave) { | 289 | if (this.needsSave) { |
278 | //TODO: Prompt user to save or lose data | 290 | //Creating prompt to ask user to save the file |
291 | var prompt = NinjaPrompt.create(); | ||
292 | prompt.initialize('confirm', {message: 'Do you want to save the changes you made in the document '+this.file.name+'?\n\nYour changes will be lost if you do not save them.'}, function (result){this.handleSavePrompt(result, callback);}.bind(this)); | ||
293 | //Showing the prompt, it will make callback with user input | ||
294 | prompt.show(); | ||
279 | } else { | 295 | } else { |
280 | //Close file | 296 | //TODO: Add support for other views |
281 | success = true; | 297 | if (!view || view === 'design') { |
282 | } | 298 | this.closeView('design'); |
283 | //Checking for view mode to close | 299 | } |
284 | if (this.views.design && (!view || view === 'design')) { | 300 | //Making callback |
285 | //TODO: Create a destroy method, this is messy | 301 | if (callback) callback(); |
286 | this.views.design.pauseAndStopVideos(); | ||
287 | this.parentContainer.removeChild(this.views.design.iframe); | ||
288 | this.views.design = null; | ||
289 | } | 302 | } |
290 | //Returning result of operation | 303 | |
291 | return success; | ||
292 | } | 304 | } |
293 | } | 305 | }, |
306 | //////////////////////////////////////////////////////////////////// | ||
307 | // | ||
308 | closeView: { | ||
309 | value: function (view) { | ||
310 | //Checking for view mode to close | ||
311 | switch (view.toLowerCase()) { | ||
312 | case 'design': | ||
313 | //TODO: Make into clean method in the design view | ||
314 | this.views.design.pauseAndStopVideos(); | ||
315 | this.parentContainer.removeChild(this.views.design.iframe); | ||
316 | this.views.design = null; | ||
317 | break; | ||
318 | default: | ||
319 | //TODO: Error? | ||
320 | break; | ||
321 | } | ||
322 | } | ||
323 | } | ||
294 | //////////////////////////////////////////////////////////////////// | 324 | //////////////////////////////////////////////////////////////////// |
295 | //////////////////////////////////////////////////////////////////// | 325 | //////////////////////////////////////////////////////////////////// |
296 | }); | 326 | }); |
diff --git a/js/models/element-model.js b/js/models/element-model.js index 76f15b21..e5a0f33a 100755 --- a/js/models/element-model.js +++ b/js/models/element-model.js | |||
@@ -91,6 +91,8 @@ var elementNameToController = function(name) { | |||
91 | return "block"; | 91 | return "block"; |
92 | } else if(name === "img") { | 92 | } else if(name === "img") { |
93 | return "image"; | 93 | return "image"; |
94 | } else if(name === "embed") { | ||
95 | return "image"; | ||
94 | } else { | 96 | } else { |
95 | return name; | 97 | return name; |
96 | } | 98 | } |
@@ -174,6 +176,8 @@ var elmo = exports.ElementModel = Montage.create(Montage, { | |||
174 | return "block"; | 176 | return "block"; |
175 | } else if(name === "img") { | 177 | } else if(name === "img") { |
176 | return "image"; | 178 | return "image"; |
179 | } else if(name === "embed") { | ||
180 | return "image"; | ||
177 | } else { | 181 | } else { |
178 | return name; | 182 | return name; |
179 | } | 183 | } |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index b57aecd2..2d43af7a 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -169,6 +169,10 @@ exports.Ninja = Montage.create(Component, { | |||
169 | this.setupGlobalHelpers(); | 169 | this.setupGlobalHelpers(); |
170 | 170 | ||
171 | window.addEventListener("resize", this, false); | 171 | window.addEventListener("resize", this, false); |
172 | //Prompting the user to make sure data was saved before closing Ninja | ||
173 | window.onbeforeunload = function () { | ||
174 | return 'Are you sure you want to close Ninja? Any unsaved data will be lost.'; | ||
175 | }; | ||
172 | 176 | ||
173 | this.eventManager.addEventListener("selectTool", this, false); | 177 |