diff options
Diffstat (limited to 'js')
13 files changed, 93 insertions, 108 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 0f02ca3c..ddaeb061 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -71,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
71 | handleAddComponentFirstDraw: { | 71 | handleAddComponentFirstDraw: { |
72 | value: function (e) { | 72 | value: function (e) { |
73 | //TODO: Add logic to reparse the document for dynamically added styles | 73 | //TODO: Add logic to reparse the document for dynamically added styles |
74 | console.log(e); | 74 | //console.log(e); |
75 | } | 75 | } |
76 | }, | 76 | }, |
77 | 77 | ||
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js index 975f9f7a..4c177189 100644 --- a/js/controllers/presets-controller.js +++ b/js/controllers/presets-controller.js | |||
@@ -72,20 +72,19 @@ exports.PresetsController = Montage.create(Component, { | |||
72 | selectorBase = stylesController.generateClassName(selectorBase); | 72 | selectorBase = stylesController.generateClassName(selectorBase); |
73 | 73 | ||
74 | selection.forEach(function(element) { | 74 | selection.forEach(function(element) { |
75 | var el = element._element, | 75 | var animationName; |
76 | animationName; | ||
77 | 76 | ||
78 | if(useTransition) { | 77 | if(useTransition) { |
79 | this.addTransition(el); | 78 | this.addTransition(element); |
80 | } | 79 | } |
81 | 80 | ||
82 | ///// TODO: remove when we find out what to do with competing animations | 81 | ///// TODO: remove when we find out what to do with competing animations |
83 | animationName = stylesController.getElementStyle(el, '-webkit-animation-name'); | 82 | animationName = stylesController.getElementStyle(element, '-webkit-animation-name'); |
84 | if(animationName) { | 83 | if(animationName) { |
85 | animationNames.push(animationName); | 84 | animationNames.push(animationName); |
86 | } | 85 | } |
87 | 86 | ||
88 | el.classList.add(selectorBase); | 87 | element.classList.add(selectorBase); |
89 | 88 | ||
90 | }, this); | 89 | }, this); |
91 | 90 | ||
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 2422f5e7..7a2d817a 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, { | |||
55 | scrollable: true, | 55 | scrollable: true, |
56 | collapsed: true, | 56 | collapsed: true, |
57 | open: true, | 57 | open: true, |
58 | modulePath: "js/panels/Components/ComponentsPanelBase.reel", | 58 | modulePath: "js/panels/components-panel.reel", |
59 | moduleName: "ComponentsPanelBase" | 59 | moduleName: "ComponentsPanel" |
60 | }, | 60 | }, |
61 | // { | 61 | // { |
62 | // name: "Project/Assets", | 62 | // name: "Project/Assets", |
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index b0ffe2d8..ed7df972 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js | |||
@@ -1085,7 +1085,7 @@ exports.CoreIoApi = Montage.create(Component, { | |||
1085 | isValidUri:{ | 1085 | isValidUri:{ |
1086 | value: function(uri){ | 1086 | value: function(uri){ |
1087 | var isWindowsUri=false, isUnixUri=false,status=false; | 1087 | var isWindowsUri=false, isUnixUri=false,status=false; |
1088 | if(uri !== ""){ | 1088 | if((uri !== null) && (uri !== "")){ |
1089 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces | 1089 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces |
1090 | 1090 | ||
1091 | //for local machine folder uri | 1091 | //for local machine folder uri |
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 46e8b386..0f66468a 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 | |||
@@ -21,6 +21,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, { | |||
21 | 21 | ||
22 | this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false); | 22 | this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false); |
23 | this.newFileDirectory.addEventListener("paste", this, false); | 23 | this.newFileDirectory.addEventListener("paste", this, false); |
24 | this.newFileDirectory.addEventListener("search", this, false); | ||
24 | } | 25 | } |
25 | }, | 26 | }, |
26 | 27 | ||
@@ -74,16 +75,20 @@ var FileInputField = exports.FileInputField = Montage.create(Component, { | |||
74 | 75 | ||
75 | handleNewFileDirectoryOnkeyup:{ | 76 | handleNewFileDirectoryOnkeyup:{ |
76 | value:function(evt){ | 77 | value:function(evt){ |
77 | if(this.newFileDirectory.value !== ""){ | 78 | var newFileDirectorySetEvent = document.createEvent("Events"); |
78 | var newFileDirectorySetEvent = document.createEvent("Events"); | 79 | newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false); |
79 | newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false); | 80 | newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value; |
80 | newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value; | 81 | newFileDirectorySetEvent.keyCode = evt.keyCode; |
81 | newFileDirectorySetEvent.keyCode = evt.keyCode; | 82 | this.eventManager.dispatchEvent(newFileDirectorySetEvent); |
82 | this.eventManager.dispatchEvent(newFileDirectorySetEvent); | ||
83 | } | ||
84 | } | 83 | } |
85 | }, | 84 | }, |
86 | 85 | ||
86 | handleSearch:{ | ||
87 | value:function(evt){ | ||
88 | this.handleNewFileDirectoryOnkeyup(evt); | ||
89 | } | ||
90 | }, | ||
91 | |||
87 | handleFileInputPickerSelectionsDone:{ | 92 | handleFileInputPickerSelectionsDone:{ |
88 | value: function(evt){ | 93 | value: function(evt){ |
89 | var selectedUri = ""; | 94 | var selectedUri = ""; |
@@ -105,7 +110,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, { | |||
105 | if(!!obj && obj.uri && obj.uri.length > 0){ | 110 | if(!!obj && obj.uri && obj.uri.length > 0){ |
106 | selectedUri = obj.uri[0]; | 111 | selectedUri = obj.uri[0]; |
107 | this.newFileDirectory.value = selectedUri; | 112 | this.newFileDirectory.value = selectedUri; |
108 | 113 | this.newFileDirectory.focus(); | |
109 | var newFileDirectorySetEvent = document.createEvent("Events"); | 114 | var newFileDirectorySetEvent = document.createEvent("Events"); |
110 | newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false); | 115 | newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false); |
111 | newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value; | 116 | newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value; |
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 02579676..3582f1a5 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 | |||
@@ -24,6 +24,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { | |||
24 | 24 | ||
25 | this.newFileName.addEventListener("keyup", this, false); | 25 | this.newFileName.addEventListener("keyup", this, false); |
26 | this.newFileName.addEventListener("paste", this, false); | 26 | this.newFileName.addEventListener("paste", this, false); |
27 | this.newFileName.addEventListener("search", this, false); | ||
27 | this.newFileName.focus(); | 28 | this.newFileName.focus(); |
28 | this.newFileName.select(); | 29 | this.newFileName.select(); |
29 | } | 30 | } |
@@ -39,14 +40,16 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { | |||
39 | 40 | ||
40 | handleKeyup:{ | 41 | handleKeyup:{ |
41 | value:function(evt){ | 42 | value:function(evt){ |
42 | if(this.newFileName.value !== "") { | 43 | var newFileNameSetEvent = document.createEvent("Events"); |
43 | var newFileNameSetEvent = document.createEvent("Events"); | 44 | newFileNameSetEvent.initEvent("newFileNameSet", false, false); |
44 | newFileNameSetEvent.initEvent("newFileNameSet", false, false); | 45 | newFileNameSetEvent.newFileName = this.newFileName.value; |
45 | newFileNameSetEvent.newFileName = this.newFileName.value; | 46 | newFileNameSetEvent.keyCode = evt.keyCode; |
46 | newFileNameSetEvent.keyCode = evt.keyCode; | 47 | this.eventManager.dispatchEvent(newFileNameSetEvent); |
47 | this.eventManager.dispatchEvent(newFileNameSetEvent); | 48 | } |
48 | } | 49 | }, |
50 | handleSearch:{ | ||
51 | value:function(evt){ | ||
52 | this.handleKeyup(evt); | ||
49 | } | 53 | } |
50 | } | 54 | } |
51 | |||
52 | }); \ No newline at end of file | 55 | }); \ No newline at end of file |
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 c98955ca..35c3b28e 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 | |||
@@ -30,12 +30,12 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
30 | newFileName:{ | 30 | newFileName:{ |
31 | writable:true, | 31 | writable:true, |
32 | enumerable:false, | 32 | enumerable:false, |
33 | value:"" | 33 | value:null |
34 | }, | 34 | }, |
35 | newFileDirectory:{ | 35 | newFileDirectory:{ |
36 | writable:true, | 36 | writable:true, |
37 | enumerable:false, | 37 | enumerable:false, |
38 | value:"" | 38 | value:null |
39 | }, | 39 | }, |
40 | templateWidth:{ | 40 | templateWidth:{ |
41 | writable:true, | 41 | writable:true, |
@@ -331,7 +331,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
331 | }else if(evt.keyCode === 27){ | 331 | }else if(evt.keyCode === 27){ |