10 files changed, 264 insertions, 51 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 753161aa..2035d2e0 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -2447,7 +2447,40 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
                     }
                     this._LocalPoints = newPoints.slice(0);
                 }
-            }
+
+                // *** compute the bounding box *********
+                var BBoxMin = [Infinity, Infinity, Infinity];
+                var BBoxMax = [-Infinity, -Infinity, -Infinity];
+                if (numPoints === 0) {
+                    BBoxMin = [0, 0, 0];
+                    BBoxMax = [0, 0, 0];
+                } else {
+                    for (var i=0;i<numPoints;i++){
+                        var pt = this._LocalPoints[i];
+                        for (var d = 0; d < 3; d++) {
+                            if (BBoxMin[d] > pt[d]) {
+                                BBoxMin[d] = pt[d];
+                            }
+                            if (BBoxMax[d] < pt[d]) {
+                                BBoxMax[d] = pt[d];
+                            }
+                        }//for every dimension d from 0 to 2
+                    }
+                }
+
+                //increase the bbox given the stroke width and the angle (in case of calligraphic brush)
+                var bboxPadding = this._strokeWidth*0.5;
+                for (var d = 0; d < 3; d++) {
+                    BBoxMin[d]-= bboxPadding;
+                    BBoxMax[d]+= bboxPadding;
+                }//for every dimension d from 0 to 2
+
+                //******* update the local coords so that the bbox min is at the origin ******
+                for (var i=0;i<numPoints;i++) {
+                    this._LocalPoints[i][0]-= BBoxMin[0];
+                    this._LocalPoints[i][1]-= BBoxMin[1];
+                }
+            }//if we need to do smoothing
         }
     },
 
@@ -2571,7 +2604,10 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
                     var disp = [brushStamp[t][0], brushStamp[t][1]];
                     var alphaVal = 1.0;
                     var distFromOpaqueRegion = Math.abs(t-halfNumTraces) - opaqueRegionHalfWidth;
-                    if (distFromOpaqueRegion>0) {
+                    if (numTraces === 1){
+                        distFromOpaqueRegion = 0;
+                    }
+                    else if (distFromOpaqueRegion>0) {
                         var transparencyFactor = distFromOpaqueRegion/maxTransparentRegionHalfWidth;
                         alphaVal = 1.0 - transparencyFactor;//(transparencyFactor*transparencyFactor);//the square term produces nonlinearly varying alpha values
                         alphaVal *= 0.5; //factor that accounts for lineWidth == 2
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 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =   require("montage/core/core").Montage,
+        Component = require("montage/ui/component").Component;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.NinjaPrompt = Montage.create(Component, {
+        ////////////////////////////////////////////////////////////////////
+        //TODO: This should have an UI template eventually
+        hasTemplate: {
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+        //Type of prompt window (should be confirm, prompt, alert, or input)
+        _type: {
+                value: null
+        },
+        ////////////////////////////////////////////////////////////////////
+        //
+        _params: {
+                value: null
+        },
+        ////////////////////////////////////////////////////////////////////
+        //
+        _callback: {
+                value: null
+        },
+    ////////////////////////////////////////////////////////////////////
+        //
+        initialize: {
+                value: function (type, params, callback) {
+                        //
+                        this._type = type.toLowerCase();
+                        this._params = params;
+                        this._callback = callback;
+                }
+        },
+        ////////////////////////////////////////////////////////////////////
+        //
+        show: {
+                value: function () {
+                        //
+                        var input;
+                        //
+                        switch (this._type) {
+                                case 'confirm':
+                                        input = confirm(this._params.message);
+                                        if (this._callback) this._callback(input);
+                                        break;
+                                default:
+                                        //TODO: Add support for other standard box types
+                                        break;
+                        }
+                }
+        },
+        ////////////////////////////////////////////////////////////////////
+        //This is for later, need to hide if need (overwrite)
+        hide: {
+                value: function () {
+                        //TODO: Add support as real UI component
+                }
+        }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ 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, {
         //
         closeDocument: {
                 value: function (context, callback) {
-                        //Closing document and getting outcome
-                        var closed = this.model.close(null);
-                        //Making callback if specified
-                        if (callback) callback.call(context, this);
+                        //Closing document (sending null to close all views)
+                        this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this));
                 }
         },
     ////////////////////////////////////////////////////////////////////
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
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+var Montage =           require("montage/core/core").Montage,
+        Component =     require("montage/ui/component").Component,
+        NinjaPrompt =   require("js/components/prompt.reel").NinjaPrompt;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.BaseDocumentModel = Montage.create(Component, {
@@ -267,30 +268,59 @@ exports.BaseDocumentModel = Montage.create(Component, {
                         if (this.callback) this.callback(result);
                 }
         },
+        ////////////////////////////////////////////////////////////////////
+        //
+        handleSavePrompt: {
+                value: function (continueToClose, callback) {
+                        //TODO: Perhaps add logic to save the file is the user wants
+                        if (continueToClose) {
+                                if (callback) callback();
+                        } else {
+                                //User canceled
+                                //this.saveAll(null, callback);
+                        }
+                }
+        },
     ////////////////////////////////////////////////////////////////////
         //TODO: Implement better logic to include different views on single document
         close: {
         value: function (view, callback) {
-                //Outcome of close (pending on save logic)
-                var success;
-                //
+                //Checking if files needs to be saved to avoid losing data
                 if (this.needsSave) {
-                        //TODO: Prompt user to save or lose data
+                        //Creating prompt to ask user to save the file
+                        var prompt = NinjaPrompt.create();
+                        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));
+                        //Showing the prompt, it will make callback with user input
+                        prompt.show();
                 } else {
-                        //Close file
-                        success = true;
-                }
-                //Checking for view mode to close
-                if (this.views.design && (!view || view === 'design')) {
+                        //TODO: Add support for other views
+                        if (!view || view === 'design') {
+                                this.closeView('design');
+                        }
+                        //Making callback