Permalink
Browse files

Merge pull request #491 from blackberry/next

version 0.9.8
  • Loading branch information...
dansilivestru committed Aug 15, 2012
2 parents d427fb7 + 845a8fa commit 311cf59a58ae4ba0a4db846abd0a4758328a4eeb
Showing with 1,144 additions and 176 deletions.
  1. +2 −1 .gitignore
  2. +1 −0 .jshintignore
  3. +12 −13 README.md
  4. +4 −2 build/build/chromestore.js
  5. +1 −0 build/build/chromium.js
  6. +8 −0 doc/CHANGELOG.md
  7. +348 −0 ext/assets/index.html
  8. +75 −2 ext/assets/ripple.css
  9. +8 −0 ext/assets/themes/dark/theme.css
  10. +9 −0 ext/assets/themes/light/theme.css
  11. +34 −0 ext/chromestore/controllers/PopUp.js
  12. +45 −0 ext/chromestore/views/popup.html
  13. +97 −15 ext/chromium/controllers/Background.js
  14. +52 −2 ext/chromium/controllers/PopUp.js
  15. +7 −1 ext/chromium/styles/extension.css
  16. +25 −1 ext/chromium/views/popup.html
  17. +0 −13 lib/ripple.js
  18. +2 −0 lib/ripple/devices.js
  19. +0 −2 lib/ripple/devices/Bold9700.js
  20. +0 −2 lib/ripple/devices/Bold9900.js
  21. +0 −2 lib/ripple/devices/Colt.js
  22. +0 −2 lib/ripple/devices/Curve9300.js
  23. +0 −2 lib/ripple/devices/Curve9350-9360-9370.js
  24. +0 −2 lib/ripple/devices/FWVGA.js
  25. +0 −2 lib/ripple/devices/G1.js
  26. +0 −2 lib/ripple/devices/HPPre3.js
  27. +0 −2 lib/ripple/devices/HPVeer.js
  28. +0 −2 lib/ripple/devices/HVGA.js
  29. +0 −2 lib/ripple/devices/Legend.js
  30. +0 −2 lib/ripple/devices/Nexus.js
  31. +52 −0 lib/ripple/devices/Nexus7.js
  32. +52 −0 lib/ripple/devices/NexusGalaxy.js
  33. +0 −2 lib/ripple/devices/NexusS.js
  34. +0 −2 lib/ripple/devices/NokiaN8.js
  35. +0 −2 lib/ripple/devices/NokiaN97.js
  36. +0 −2 lib/ripple/devices/PalmPre.js
  37. +0 −2 lib/ripple/devices/PalmPre2.js
  38. +0 −2 lib/ripple/devices/Pearl9100.js
  39. +1 −3 lib/ripple/devices/Playbook.js
  40. +0 −2 lib/ripple/devices/QVGA.js
  41. +0 −2 lib/ripple/devices/Style9670.js
  42. +0 −2 lib/ripple/devices/Tattoo.js
  43. +0 −2 lib/ripple/devices/Torch9800.js
  44. +0 −2 lib/ripple/devices/Torch9810.js
  45. +0 −2 lib/ripple/devices/Torch9860-9850.js
  46. +0 −2 lib/ripple/devices/WQVGA.js
  47. +0 −2 lib/ripple/devices/WVGA.js
  48. +0 −2 lib/ripple/devices/Wave.js
  49. +0 −2 lib/ripple/devices/iPad.js
  50. +0 −2 lib/ripple/devices/iPhone3.js
  51. +18 −2 lib/ripple/platform/webworks.bb10/1.0.0/event.js
  52. +27 −0 lib/ripple/platform/webworks.bb10/1.0.0/navigator.js
  53. +1 −1 lib/ripple/platform/webworks.bb10/1.0.0/spec.js
  54. +25 −3 lib/ripple/platform/webworks.bb10/1.0.0/spec/device.js
  55. +8 −0 lib/ripple/platform/webworks.bb10/1.0.0/system.js
  56. +15 −0 lib/ripple/platform/webworks.handset/2.0.0/client/system.js
  57. +26 −0 lib/ripple/platform/webworks.tablet/2.0.0/client/system.js
  58. +2 −2 lib/ripple/platform/webworks.tablet/2.0.0/spec.js
  59. +21 −1 lib/ripple/ui.js
  60. +41 −26 lib/ripple/ui/plugins/build.js
  61. +13 −2 lib/ripple/ui/plugins/build/panel.html
  62. +54 −0 lib/ripple/ui/plugins/eulaCheck.js
  63. +11 −12 lib/ripple/ui/plugins/information.js
  64. +2 −1 lib/ripple/ui/plugins/invoke.js
  65. +4 −0 lib/ripple/ui/plugins/invoke/panel.html
  66. +10 −12 lib/ripple/ui/plugins/platform.js
  67. +1 −2 package.json
  68. +29 −0 test/unit/ui.js
  69. +1 −1 thirdparty/jasmine
View
@@ -11,4 +11,5 @@ tags
www/*
build_output/
pkg
-plugins
+/plugins
+services
View
@@ -3,3 +3,4 @@ node_modules
thirdparty
ext
pkg
+services
View
@@ -33,36 +33,35 @@ To test ripple as an extension in chrome/chromium just load the chromium folder
jake -T
-This will describe all the available commands for building and running the tests
+This will describe all the available commands for building and running the tests.
## Running as a Chrome Extension
-- go to the extension management page (chrome://chrome/extensions/) in chrome.
-- Ensure that you have selected the developer mode checkbox
-- click the Load Unpacked extension button
-- select the chromestore folders in the pkg/ folder.
+* Go to the extension management page (chrome://chrome/extensions/) in chrome.
+* Ensure that you have selected the developer mode checkbox.
+* Click the Load Unpacked extension button.
+* Select the chromestore folders in the pkg/ folder.
-NOTE: for development you should be fine to just build with jake and refresh your browser. If
-you end up editing anything in the ext folder you will need to refresh the extension from
-the extension management page.
+NOTE: For development you should be fine to just build with jake and refresh your browser.
+If you end up editing anything in the ext folder you will need to refresh the extension from the extension management page.
## Running Inside Other Web Browsers
Ripple is (by-design) browser agnostic, and is able to run inside any web browser (with disabled web security).
+However, this has (for the most part) only been used in Chrome (and as a result certain things are used that are not supported/tested in other browsers).
+
To get it running inside Chrome you should start it with these [command line](http://www.chromium.org/developers/how-tos/run-chromium-with-flags) flags:
--app=http://path/to/ripple-ui/pkg/web
--disable-web-security
--user-data-dir=/path/to/dummy/profile
-This has only really be tested in chrome.
-
## Code Guidelines
-* 4 spaces per editor tab
-* jake lint, no new lint errors introduced
-* all unit tests are green
+* 4 spaces per editor tab.
+* `jake lint`, no new lint errors introduced.
+* All unit tests are green.
## Reference Material & Community
@@ -24,8 +24,10 @@ module.exports = function (src, baton) {
'cp -r ' + _c.ASSETS + "images " + _c.DEPLOY + "chromestore/ &&" +
'cp -r ' + _c.ASSETS + "themes " + _c.DEPLOY + "chromestore/ &&" +
'cp ' + _c.EXT + "chromestore/manifest.json " + _c.DEPLOY + "chromestore/manifest.json &&" +
- 'cp ' + _c.EXT + "chromestore/controllers/Background.js " + _c.DEPLOY + "chromestore/controllers/Background.js" +
- 'cp ' + _c.EXT + "chromestore/views/background.html " + _c.DEPLOY + "chromestore/views/background.html";
+ 'cp ' + _c.EXT + "chromestore/controllers/Background.js " + _c.DEPLOY + "chromestore/controllers/Background.js &&" +
+ 'cp ' + _c.EXT + "chromestore/controllers/PopUp.js " + _c.DEPLOY + "chromestore/controllers/PopUp.js &&" +
+ 'cp ' + _c.EXT + "chromestore/views/background.html " + _c.DEPLOY + "chromestore/views/background.html &&" +
+ 'cp ' + _c.EXT + "chromestore/views/popup.html " + _c.DEPLOY + "chromestore/views/popup.html";
childProcess.exec(copy, function () {
var css = _c.ASSETS + "ripple.css",
View
@@ -23,6 +23,7 @@ module.exports = function (src, baton) {
var copy = 'cp -r ' + _c.EXT + "chromium " + _c.DEPLOY + " && " +
'cp -r ' + _c.ASSETS + "images " + _c.DEPLOY + "chromium/ &&" +
'cp -r ' + _c.ASSETS + "themes " + _c.DEPLOY + "chromium/" +
+ 'cp -r ' + _c.ROOT + "services " + _c.DEPLOY + "chromium/" +
'cp -r ' + _c.ROOT + "plugins " + _c.DEPLOY + "chromium/";
childProcess.exec(copy, function () {
View
@@ -1,3 +1,11 @@
+## v0.9.8 - Aug 15, 2012
+
+* Introduced integrated Build & Deploy Services in RIM hosted Ripple
+* Added ability to select Theme through querystring param for auto-enabling Ripple
+* Minor UI clean up work
+* Added Nexus 7 Device
+* Added Galaxy Nexus Device
+
## v0.9.7 - July 19, 2012
* Fixed an issue with Ripple booting on Chrome 21 dev channel
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -56,6 +56,10 @@ input, textarea, keygen, select, button, isindex, datagrid {
.main {
font-size: 12px !important;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
}
/* TODO: better css for this specificity */
@@ -71,7 +75,7 @@ input, textarea, keygen, select, button, isindex, datagrid {
border: 0;
}
-.main table{
+.main table {
font-size: 1.00em;
}
@@ -82,7 +86,7 @@ input, textarea, keygen, select, button, isindex, datagrid {
}
.main option {
- background-color: transparent;
+ background-color: transparent;
}
input:focus, textarea:focus, isindex:focus, keygen:focus, select:focus {
@@ -110,6 +114,13 @@ input:focus, textarea:focus, isindex:focus, keygen:focus, select:focus {
.irrelevant { display: none; }
+.text-is-selectable {
+ -webkit-user-select: text;
+ -moz-user-select: text;
+ -ms-user-select: text;
+ user-select: text;
+}
+
section, header, footer, aside, nav { display: block; }
/* ------------------------------>
@@ -896,6 +907,68 @@ section.left { left: 0; }
text-align: left;
}
+/* ------------------------------>
+ EULA Window */
+
+.eula-window {
+ z-index: 9000;
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ text-align:center;
+ vertical-align: middle;
+ display: none;
+}
+
+.eula-dialog {
+ z-index: 9001;
+ position: absolute;
+ top: 200px;
+ padding: 20px 0 20px 130px;
+ opacity: 1;
+ width: 450px;
+ height: auto;
+ text-align: center;
+ vertical-align: middle;
+ margin: 0 auto;
+ display: none;
+}
+
+ .eula-logo {
+ background: url("images/ripplelogo_large.png") no-repeat 10px 10px;
+ background-size: 100% 100%;
+ position: absolute;
+ width: 122px;
+ height: 200px;
+ top: 0;
+ left: 0;
+ }
+
+ .eula-dialog > button {
+ margin: 0 .25em;
+ }
+
+ .eula-text h2 {
+ font-size: 1.25em;
+ }
+
+ .eula-text p {
+ font-size: 1.17em;
+ }
+
+ .eula-text div {
+ font-size: 1em;
+ width: 90%;
+ margin: 0 auto;
+ height: 250px;
+ overflow-y: auto;
+ background-color: #e1e1e1;
+ color: #1e1e1e;
+ text-align: left;
+ }
+
+
/* ------------------------------>
First Run Window */
@@ -515,6 +515,14 @@ input.ui-button { padding: .4em 1em; }
background: #1e1e1e;
}
+.eula-window {
+ background-color: rgba(30, 30, 30, 1);
+}
+
+.eula-dialog {
+ color: #F0F0F0;
+}
+
.first-run-window {
background-color: rgba(30, 30, 30, 1);
}
@@ -526,6 +526,15 @@ input.ui-button { padding: .4em 1em; }
.error-dialog {
color: #212121;
}
+
+.eula-window {
+ background-color: rgba(218, 218, 218, 1);
+}
+
+.eula-dialog {
+ color: #212121;
+}
+
.first-run-window {
background-color: rgba(218, 218, 218, 1);
}
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 Research In Motion Limited.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+window.addEventListener('load', function () {
+ var background = chrome.extension.getBackgroundPage().tinyHippos.Background;
+
+ function _handle(func) {
+ return function () {
+ try {
+ func();
+ } catch (e) {
+ alert(e.message + "\n" + e.stack);
+ }
+ };
+ }
+
+ document.getElementById("popup-enable")
+ .addEventListener('click', _handle(background.enable));
+
+ document.getElementById("popup-disable")
+ .addEventListener('click', _handle(background.disable));
+});
@@ -0,0 +1,45 @@
+<!--
+ * Copyright 2011 Research In Motion Limited.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<!DOCTYPE html>
+<html>
+ <head>
+ <link media="screen" rel="stylesheet" type="text/css" href="../styles/extension.css" />
+ <link media="screen" rel="stylesheet" type="text/css" href="../themes/dark/theme.css" />
+ <script type="text/javascript" src="../controllers/PopUp.js"></script>
+ </head>
+ <body class="popup-body">
+ <div id="main" class="layout">
+
+ <div id="popup-enable-container">
+ <h2>Ripple Mission Control</h2>
+ <p>This is the Ripple control panel, where you can enable and disable Ripple for the current page URL and all pages contained within it.</p>
+
+ <button id="popup-enable" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <span class="ui-button-text">Enable</span>
+ </button>
+
+ <button id="popup-disable" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <span class="ui-button-text">Disable</span>
+ </button>
+
+ <hr>
+
+ <p>New to Ripple? Hit up the <a href="http://developer.blackberry.com/html5/documentation" target="_new">Main Documentation</a> to get started.</p>
+ </div>
+ </div>
+ </body>
+</html>
+
Oops, something went wrong.

0 comments on commit 311cf59

Please sign in to comment.