From adb90eff3323aa780f9a0879572e3cf3b9f0b969 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Tue, 21 Feb 2012 13:04:58 -0800 Subject: - file picker - select file on double click - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen --- js/data/menu-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 7c3ca5d4..52710b3a 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -44,7 +44,7 @@ exports.MenuData = Montage.create( Montage, { "displayText" : "Save As", "hasSubMenu" : false, "enabled": true, - "action":"saveAs" + "action":"executeSaveAs" }, { "displayText" : "Save All", -- cgit v1.2.3 From 8974ecd564563a991ff96f9cb6d47da172174242 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 22 Feb 2012 00:49:47 -0800 Subject: local storage integration and versioning - Fixed the splitters Signed-off-by: Valerio Virgillito --- js/data/settings.js | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'js/data') diff --git a/js/data/settings.js b/js/data/settings.js index ffea2075..6b1af3fc 100755 --- a/js/data/settings.js +++ b/js/data/settings.js @@ -10,10 +10,6 @@ var Montage = require("montage/core/core").Montage, exports.Settings = Montage.create( Component, { - version: { - value: "11.1213" - }, - _settings: { value: null }, @@ -54,18 +50,5 @@ exports.Settings = Montage.create( Component, { return null; } } - }, - - deserializedFromSerialization: { - value: function() { - - if (LocalStorage.getItem("version") != this.version) { - this.settings = {} - LocalStorage.setItem("version",this.version); - } else { - this.settings = LocalStorage.getItem("settings"); - } - - } } }); \ No newline at end of file -- cgit v1.2.3 From d4a110bf2c7a949c627966ed01db7a4d32d62757 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:04:19 -0800 Subject: Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..96367203 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,17 +157,17 @@ exports.ToolsData = Montage.create(Montage, { "container": false, "selected": false }, -// { -// "id": "InkBottleTool", -// "properties": "inkbottleProperties", -// "spriteSheet": true, -// "action": "InkBottleTool", -// "toolTip": "Ink Bottle Tool", -// "cursor": "url('images/tools/inkbottle_down.png'), default", -// "lastInGroup": false, -// "container": false, -// "selected": false -// }, + { + "id": "InkBottleTool", + "properties": "inkbottleProperties", + "spriteSheet": true, + "action": "InkBottleTool", + "toolTip": "Ink Bottle Tool", + "cursor": "url('images/tools/inkbottle_down.png'), default", + "lastInGroup": false, + "container": false, + "selected": false + }, { "id": "EyedropperTool", "properties": "eyedropperProperties", -- cgit v1.2.3 From 6ad427c4975b9a30f87dfb8ad53614cd4b6e65b9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:12:16 -0800 Subject: Marking inkbottle as the final tool in the set. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 96367203..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "FillTool", "toolTip": "Fill Tool", "cursor": "url('images/tools/bucket_down.png'), default", - "lastInGroup": true, + "lastInGroup": false, "container": false, "selected": false }, @@ -164,7 +164,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "InkBottleTool", "toolTip": "Ink Bottle Tool", "cursor": "url('images/tools/inkbottle_down.png'), default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, -- cgit v1.2.3 From 72baf1c366829ada6858097dd7553ee9988d6110 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 24 Feb 2012 14:43:51 -0800 Subject: removing the old settings class and disabling panel settings until the new panels are in Signed-off-by: Valerio Virgillito --- js/data/settings.js | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100755 js/data/settings.js (limited to 'js/data') diff --git a/js/data/settings.js b/js/data/settings.js deleted file mode 100755 index 6b1af3fc..00000000 --- a/js/data/settings.js +++ /dev/null @@ -1,54 +0,0 @@ -/* -This file contains proprietary software owned by Motorola Mobility, Inc.
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
-(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. - */ - -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - LocalStorage = require("js/controllers/local-storage-controller").LocalStorage; - -exports.Settings = Montage.create( Component, { - - _settings: { - value: null - }, - - settings: { - get: function() { return this._settings; }, - set: function(value) { this._settings = value; } - }, - - getSetting: { - value: function(objName, fieldName, namespace) { - try { - objName = objName.replace(/-/gi, "_").replace(/\//gi, "zzSlash"); - return this.settings[objName][fieldName]; - } catch(e) { - return null; - } - } - }, - - setSetting: { - value: function(objName, fieldName, value, namespace) { - try { - objName = objName.replace(/-/gi, "_").replace(/\//gi, "zzSlash"); - - if(this.settings === null) { - this.settings = {}; - } - - if (this.settings[objName] == null) { - this.settings[objName] = {}; - } - - this.settings[objName][fieldName] = value; - - LocalStorage.setItem("settings", this.settings); - } catch(e) { - return null; - } - } - } -}); \ No newline at end of file -- cgit v1.2.3