diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/components/combobox.reel/combobox.js | 2 | ||||
-rw-r--r-- | js/components/radio.reel/radio.js | 6 | ||||
-rw-r--r-- | js/ninja.reel/ninja.js | 5 | ||||
-rw-r--r-- | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | 2 | ||||
-rwxr-xr-x | js/preloader/Preloader.js | 1 |
5 files changed, 10 insertions, 6 deletions
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js index f262bb06..a68a7d6b 100644 --- a/js/components/combobox.reel/combobox.js +++ b/js/components/combobox.reel/combobox.js | |||
@@ -67,7 +67,7 @@ exports.Combobox = Montage.create(Component, { | |||
67 | var e = document.createEvent("CustomEvent"); | 67 | var e = document.createEvent("CustomEvent"); |
68 | e.initEvent("change", true, true); | 68 | e.initEvent("change", true, true); |
69 | e.type = "change"; | 69 | e.type = "change"; |
70 | e._wasSetByCode = this._wasSetByCode; | 70 | e.wasSetByCode = this._wasSetByCode; |
71 | e.value = this._value; | 71 | e.value = this._value; |
72 | this.dispatchEvent(e); | 72 | this.dispatchEvent(e); |
73 | 73 | ||
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js index 954da3c4..c661ec11 100644 --- a/js/components/radio.reel/radio.js +++ b/js/components/radio.reel/radio.js | |||
@@ -41,7 +41,7 @@ exports.RadioGroup = Montage.create(Component, { | |||
41 | e = document.createEvent("CustomEvent"); | 41 | e = document.createEvent("CustomEvent"); |
42 | e.initEvent("change", true, true); | 42 | e.initEvent("change", true, true); |
43 | e.type = "change"; | 43 | e.type = "change"; |
44 | e._wasSetByCode = this._wasSetByCode; | 44 | e.wasSetByCode = this._wasSetByCode; |
45 | e.selectedIndex = i; | 45 | e.selectedIndex = i; |
46 | e.selectedItem = value; | 46 | e.selectedItem = value; |
47 | this.dispatchEvent(e); | 47 | this.dispatchEvent(e); |
@@ -77,7 +77,7 @@ exports.RadioGroup = Montage.create(Component, { | |||
77 | { | 77 | { |
78 | value:function(event) | 78 | value:function(event) |
79 | { | 79 | { |
80 | this._wasSetByCode = event._event._wasSetByCode; | 80 | this._wasSetByCode = event._event.wasSetByCode; |
81 | this.selectedItem = event._event.value; | 81 | this.selectedItem = event._event.value; |
82 | } | 82 | } |
83 | } | 83 | } |
@@ -126,7 +126,7 @@ exports.Radio = Montage.create(Component, { | |||
126 | var e = document.createEvent("CustomEvent"); | 126 | var e = document.createEvent("CustomEvent"); |
127 | e.initEvent("change", true, true); | 127 | e.initEvent("change", true, true); |
128 | e.type = "change"; | 128 | e.type = "change"; |
129 | e._wasSetByCode = this._wasSetByCode; | 129 | e.wasSetByCode = this._wasSetByCode; |
130 | e.value = this; | 130 | e.value = this; |
131 | this.dispatchEvent(e); | 131 | this.dispatchEvent(e); |
132 | 132 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index bc31e0e1..465533cd 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, { | |||
13 | _appLoaded: { value: false }, | 13 | _appLoaded: { value: false }, |
14 | _preload: { value: false }, | 14 | _preload: { value: false }, |
15 | 15 | ||
16 | ninjaVersion: { | ||
17 | value: window.ninjaVersion.ninja.version | ||
18 | }, | ||
19 | |||
16 | toolsData: { value: null }, | 20 | toolsData: { value: null }, |
17 | appData: { value: AppData }, | 21 | appData: { value: AppData }, |
18 | 22 | ||
@@ -36,6 +40,7 @@ exports.Ninja = Montage.create(Component, { | |||
36 | 40 | ||
37 | prepareForDraw: { | 41 | prepareForDraw: { |
38 | value: function() { | 42 | value: function() { |
43 | console.log("Loading Ninja --> ", this.ninjaVersion); | ||
39 | 44 | ||
40 | this.application.ninja = this; | 45 | this.application.ninja = this; |
41 | 46 | ||
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css index ff70b5b6..27d19e58 100644 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | |||
@@ -400,7 +400,7 @@ | |||
400 | .nj-css-error:not(.nj-css-no-error) { | 400 | .nj-css-error:not(.nj-css-no-error) { |
401 | background-repeat: no-repeat; | 401 | background-repeat: no-repeat; |
402 | background-position: 3px 2px; | 402 | background-position: 3px 2px; |
403 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAMtJREFUGJV1kM0KAXEUxc/SWh7MM0zJE3gQCxM2EpJ8bEiNjWHhBWYjYkUkRdQoGde5f2Q03PrV6ZzTrXuB0MgQiU0ba0U1/k3gwBYXoqj+WeKG2LaBgwxYJEbTixa7yMyLLPlLw6xATS9SXDWx25cZ7sYG1ep9b3OR8h3cTyUWtyMylnMNcqGn2WdbHQs94FqFnPtxg2r1NHsfkTx0EMiEG7IMpy2D0fSOPWbsgD/zzEtoik323hP75THTDvJpVHIW5I1t4aaEPe08AF+CuEXWXJtHAAAAAElFTkSuQmCC); | 403 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAALCAYAAABGbhwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowMzYyMERFNTQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowMzYyMERFNjQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjAzNjIwREUzNDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjAzNjIwREU0NDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2Bc4fwegAAAWpJREFUeNo8kLtLA0EQxr%2B9l3lcDAaCBsEqEOysBFEQsRAsRVCEpBREsbIUSxtBrAxEewsrK8VHQIhK%2FoIUUVJIQFFjYi65XDZ36%2Bz5GFgWZr75fjPDhBD4C%2BucjWgaphjQdTgK%2FfPi5a%2FGpPDtjEVjERyqKlag%2FlY8gHPsfzSwPbQgbDyfIs6vURa3EKK8Jf6jmhUy51yiWDlBUDED2NF0JKGQS3IPVn4ATXqIL0EYJgwD42YQG4quE45EggOtCwbWrUM1Ej%2F0jkXDAYaOtOa6iIH2YSQOBugPj4KN3aFdnIThkprynoeUYjtwIRO0hCLxiU3wp12odgl0AXhUa3VQ0xoWCqEApiNhEpFzt7Tm%2F4Tzo9kGvtq4UjNzqJB1mswURvNoqayP57V7KcB7HfZnE8v%2BHYtZtmiGcBzqQ1TSZUPP85HVlo1MfCaX94WPpSO83qwO6wbWCTtBQocoD70eDgZncw3Z%2BC3AAFMzlxlnnpevAAAAAElFTkSuQmCC); |
404 | opacity: 0.5; | 404 | opacity: 0.5; |
405 | } | 405 | } |
406 | .nj-editing.nj-css-error { | 406 | .nj-editing.nj-css-error { |
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index f137f4b6..93d71e8f 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
@@ -136,7 +136,6 @@ exports.Preloader = Montage.create(Component, { | |||
136 | 136 | ||
137 | deserializedFromTemplate: { | 137 | deserializedFromTemplate: { |
138 | value: function() { | 138 | value: function() { |
139 | console.log("Start Preloading"); | ||
140 | 139 | ||
141 | this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; | 140 | this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; |
142 | 141 | ||