From f7e4257745ccd44b8d24555f0ef787429d6e472c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 5 Jun 2012 00:11:03 -0700 Subject: adding the latest v0.10 montage Signed-off-by: Valerio Virgillito --- js/io/system/ninjalibrary.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/io') diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 5c1eb875..0b5804c3 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json @@ -1,6 +1,6 @@ { "libraries": [ - {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"}, + {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.1.0"}, {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.7.0"} ] } \ No newline at end of file -- cgit v1.2.3 From 76db3eb0aa4ffe9e75812db570c793e9f852f853 Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Mon, 11 Jun 2012 14:06:09 -0700 Subject: fix the brush tool runtime: update the brush coordinates to account for change in bounding box due to smoothing --- js/io/system/ninjalibrary.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/io') diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index e9df5e58..03753da9 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json @@ -1,6 +1,6 @@ { "libraries": [ {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"}, - {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.9.0"} + {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.0"} ] } \ No newline at end of file -- cgit v1.2.3 From 87ddd35160b5fb0bf6f1ad0dd6a243b19939c72c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 11 Jun 2012 23:36:37 -0700 Subject: adding more missing properties Signed-off-by: Valerio Virgillito --- .../file-input-field.reel/file-input-field.js | 10 +++ .../picker-navigator.reel/picker-navigator.js | 80 ++++++++++++++++++++++ .../new-file-location.reel/new-file-location.js | 10 +++ .../new-file-options-navigator.js | 40 +++++++++++ 4 files changed, 140 insertions(+) (limited to 'js/io') diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js index a5fab11c..11d7e5b2 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js @@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage, var FileInputField = exports.FileInputField = Montage.create(Component, { + findDirectory: { + value: null, + serializable: true + }, + + newFileDirectory: { + value: null, + serializable: true + }, + didDraw: { enumerable: false, value: function() { diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js index 945b0301..8295c68e 100644 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js @@ -11,6 +11,86 @@ var Montage = require("montage/core/core").Montage, var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { + filterVal: { + value: null, + serializable: true + }, + + error: { + value: null, + serializable: true + }, + + addressBarUri: { + value: null, + serializable: true + }, + + forwardArrow: { + value: null, + serializable: true + }, + + backArrow: { + value: null, + serializable: true + }, + + leftNav: { + value: null, + serializable: true + }, + + iconViewContainer: { + value: null, + serializable: true + }, + + iconView: { + value: null, + serializable: true + }, + + treeView: { + value: null, + serializable: true + }, + + treeViewContainer: { + value: null, + serializable: true + }, + + okButton: { + value: null, + serializable: true + }, + + metadataSection: { + value: null, + serializable: true + }, + + filters: { + value: null, + serializable: true + }, + + refreshButton: { + value: null, + serializable: true + }, + + cancelButton: { + value: null, + serializable: true + }, + + resultsArea: { + value: null, + serializable: true + }, + popup:{ enumerable: false, writable: true, diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js index e8a699cc..1eecbb9a 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js @@ -10,6 +10,16 @@ var newFileWorkflowControllerModule = require("js/io/ui/new-file-dialog/new-file var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { + fileInputField: { + value: null, + serializable: true + }, + + newFileName: { + value: null, + serializable: true + }, + templateHeight:{ value:"25 px" }, diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js index 7227d532..e6202b07 100644 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js @@ -12,6 +12,46 @@ var Montage = require("montage/core/core").Montage, var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, { + projectTypeTree: { + value: null, + serializable: true + }, + + cancelButton: { + value: null, + serializable: true + }, + + okButton: { + value: null, + serializable: true + }, + + templateIcons: { + value: null, + serializable: true + }, + + templatesContainer: { + value: null, + serializable: true + }, + + locationSelection: { + value: null, + serializable: true + }, + + newFileLocation: { + value: null, + serializable: true + }, + + error: { + value: null, + serializable: true + }, + newFileModel: { writable: true, enumerable:false, -- cgit v1.2.3 From 2ea5ac98bf50bdd43c3ba51b2223d68f0fa12324 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 14 Jun 2012 15:23:03 -0700 Subject: Adding banner template Added 'leader board' template to banners. --- js/io/templates/descriptor.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'js/io') diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json index 9c9c4ac8..8edbedd2 100644 --- a/js/io/templates/descriptor.json +++ b/js/io/templates/descriptor.json @@ -90,7 +90,7 @@ "uri":"js/io/templates/files/banner.txt", "type":"file", "fileExtension":".html", - "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"] + "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280", "728x90"] }, "120x600":{ @@ -123,6 +123,11 @@ "uri": "336x280", "type":"file" }, + "728x90":{ + "name": "Leaderboard", + "uri": "728x90", + "type":"file" + }, "js/io/templates/files/animation.txt":{ "name":"Animation", -- cgit v1.2.3