Permalink
Browse files

Merge branch 'next'

  • Loading branch information...
2 parents 203fca7 + 478aa52 commit 293f0fc42c79a2696a574104aad3a1327aad589b @ndaversa ndaversa committed Aug 23, 2011
Showing 363 changed files with 3,621 additions and 1,673 deletions.
View
@@ -10,3 +10,4 @@ tags
*.swp
www/*
build_output/
+pkg
View
@@ -0,0 +1,4 @@
+.git
+node_modules
+thirdparty
+pkg
View
@@ -69,7 +69,7 @@
"boss" : false,
"curly": false,
"bitwise" : true,
- "white": false,
+ "white": true,
"indent": 4,
"evil": false,
"devel": true,
View
@@ -17,12 +17,6 @@ In particular, the assets under ext/assets/images are excluded from the Apache S
* nodejs, npm
* OSX or linux (windows is not currently supported for development)
-## Reference Material & Community
-You can also find associated reference material for the Ripple tool as well as contributor forums at the following locations.
-
-* [Contributor Forums](http://supportforums.blackberry.com/t5/Ripple-Contributions/bd-p/ripple)
-* [Documentation](http://rippledocs.tinyhippos.com/index.html)
-
## Getting Started
./configure
@@ -33,8 +27,7 @@ This script will pull down the needed npm packages and initialize the submodules
jake
-This will build ripple to a ripple_build folder next to the ripple-ui folder.
-In that folder there is a web directory and a chromium directory.
+This will build ripple to the pkg/ folder. In that folder there is a web directory and a chromium directory.
To test ripple as an extension in chrome/chromium just load the chromium folder as an unpacked extension.
@@ -47,3 +40,11 @@ This will describe all the available commands for building and running the tests
* 4 spaces per editor tab
* jake lint, no new lint errors introduced
* all unit tests are green
+
+## Reference Material & Community
+
+You can also find associated reference material for the Ripple tool as well as contributor forums at the following locations.
+
+* [Contributor Forums](http://supportforums.blackberry.com/t5/Ripple-Contributions/bd-p/ripple)
+* [Documentation](http://rippledocs.tinyhippos.com/index.html)
+
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
<!--
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
@@ -25,7 +25,7 @@ module.exports = {
UI: __dirname + "/../../lib/ripple/ui/",
DEVICES: __dirname + "/../../lib/ripple/devices/",
THIRDPARTY: __dirname + "/../../thirdparty/",
- DEPLOY: __dirname + "/../../../ripple_build/",
+ DEPLOY: __dirname + "/../../pkg/",
SPACES_AND_TABS: /\n+|\s+|\t{2,}/g,
ESCAPED_QUOTES: '\'+"\'"+\'',
thirdpartyIncludes: [
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
/*
* 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
@@ -14,8 +14,8 @@
* limitations under the License.
*/
module.exports = function (done, files) {
- var args = files && files.length > 0 ? files : ["test/", "lib/", "build/", "ext/"],
- options = ["--reporter", "build/lint/reporter.js"],
+ var args = files && files.length > 0 ? files : ["."],
+ options = ["--reporter", "build/lint/reporter.js", "--show-non-errors"],
spawn = require('child_process').spawn,
cmd = spawn('jshint', args.concat(options)),
sys = require('sys');
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -14,12 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#cd to root of the repo
-cd ../..
-
#declare the paths relative to the root
-BUILD_OUTPUT=build_output
-RIPPLE_BUILD=../ripple_build
+BUILD_OUTPUT=../../build_output
+RIPPLE_BUILD=../../pkg
#clear build_output directory
rm -fr $BUILD_OUTPUT
View
@@ -1,6 +1,6 @@
/*
* 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
@@ -36,8 +36,7 @@ module.exports = function () {
function parseFile(file, callback) {
var lines = 0,
- loc = 0,
- text;
+ loc = 0;
if (file.match(/\.js$/)) {
// hack!
View
@@ -1,6 +1,6 @@
/*
* 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
View
@@ -1,6 +1,6 @@
<!--
* 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
@@ -1,6 +1,6 @@
/*
* 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
@@ -1,6 +1,6 @@
/*
* 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
@@ -1,6 +1,6 @@
/*
* 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
@@ -1,6 +1,6 @@
/*
* 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
@@ -32,8 +32,7 @@ tinyHippos.Background = (function () {
xhr.onreadystatechange = function () {
if (xhr.readyState === 4) {
var manifest = JSON.parse(xhr.responseText),
- currentVersion = manifest.version,
- updatePage = chrome.extension.getURL("views/update.html");
+ currentVersion = manifest.version;
if (!version) {
_wasJustInstalled = true;
@@ -1,6 +1,6 @@
/*
* 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
@@ -1,6 +1,6 @@
/*
* 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
@@ -1,6 +1,6 @@
/*
* 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
@@ -1,6 +1,6 @@
<!--
* 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
@@ -1,6 +1,6 @@
<!--
* 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
@@ -1,6 +1,6 @@
<!--
* 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
Oops, something went wrong.

0 comments on commit 293f0fc

Please sign in to comment.