diff options
| author | Jose Antonio Marquez | 2012-01-31 16:00:36 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-01-31 16:00:36 -0800 |
| commit | 67097a84b13199a6e7ee3185f1c5521208f1732f (patch) | |
| tree | be812e83d0a7db84fba2d87c3610b3ed45c10569 | |
| parent | e75223a2c4c1e13d66639841e6418e94fe9b726f (diff) | |
| parent | b01b586a26ae47d329bdd5fe005051513711fab7 (diff) | |
| download | ninja-67097a84b13199a6e7ee3185f1c5521208f1732f.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
| -rwxr-xr-x | index.html | 4 | ||||
| -rwxr-xr-x | js/components/combobox.reel/combobox.js | 2 | ||||
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.css | 1 | ||||
| -rwxr-xr-x | js/components/radio.reel/radio.js | 6 | ||||
| -rw-r--r-- | redirect.html | 23 |
5 files changed, 32 insertions, 4 deletions
| @@ -169,6 +169,10 @@ | |||
| 169 | 169 | ||
| 170 | <script type="text/javascript"> | 170 | <script type="text/javascript"> |
| 171 | window.onload = function() { | 171 | window.onload = function() { |
| 172 | // Check if we are running in Chrome | ||
| 173 | if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) { | ||
| 174 | window.location = "./redirect.html"; | ||
| 175 | } | ||
| 172 | // Load the version json | 176 | // Load the version json |
| 173 | var req = new XMLHttpRequest(); | 177 | var req = new XMLHttpRequest(); |
| 174 | req.open("GET", "versions.json"); | 178 | req.open("GET", "versions.json"); |
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js index f262bb06..a68a7d6b 100755 --- 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/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css index f84c6e80..cc984609 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.css +++ b/js/components/layout/bread-crumb.reel/bread-crumb.css | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .bread_crumb{ | 7 | .bread_crumb{ |
| 8 | background-color: #282828; | ||
| 8 | border-style: double; | 9 | border-style: double; |
| 9 | height: 26px; | 10 | height: 26px; |
| 10 | } | 11 | } |
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js index 954da3c4..c661ec11 100755 --- 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/redirect.html b/redirect.html new file mode 100644 index 00000000..cf602f58 --- /dev/null +++ b/redirect.html | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | |||
| 9 | <head> | ||
| 10 | |||
| 11 | <title>Ninja - Browser support: Download Google Chrome</title> | ||
| 12 | |||
| 13 | </head> | ||
| 14 | |||
| 15 | <body> | ||
| 16 | |||
| 17 | <div> | ||
| 18 | <p>Your browser is not supported. Please download and install the latest version of <a href="https://www.google.com/chrome/">Google Chrome</a></p> | ||
| 19 | </div> | ||
| 20 | |||
| 21 | </body> | ||
| 22 | |||
| 23 | </html> \ No newline at end of file | ||