Permalink
Browse files

Merge branch 'master' into Bluetooth

  • Loading branch information...
2 parents 9c0745e + 3e162bb commit 3bf5a252fbaf7c89f97ad47185545865a1c345b9 @eric30 committed May 3, 2012
Showing with 176,953 additions and 142,429 deletions.
  1. +1 −0 .gitignore
  2. +10 −27 LICENCE
  3. +78 −10 Makefile
  4. +5 −7 apps/browser/index.html
  5. +84 −146 apps/browser/js/browser.js
  6. +139 −0 apps/browser/js/global_history.js
  7. +46 −0 apps/browser/js/session_history.js
  8. +15 −3 apps/browser/manifest.json
  9. +20 −13 apps/browser/style/browser.css
  10. BIN apps/browser/style/images/favicon.png
  11. BIN apps/browser/style/images/go.png
  12. BIN apps/browser/style/images/loading.gif
  13. BIN apps/browser/style/images/progress.gif
  14. BIN apps/browser/style/images/refresh.png
  15. +12 −0 apps/calculator/manifest.json
  16. +12 −0 apps/camera/manifest.json
  17. +18 −0 apps/clock/locale/clock.properties
  18. +12 −0 apps/clock/manifest.json
  19. +12 −0 apps/crystalskull/manifest.json
  20. +12 −0 apps/cubevid/manifest.json
  21. +11 −0 apps/dialer/background.html
  22. +74 −0 apps/dialer/js/background.js
  23. +1 −0 apps/dialer/js/contacts.js
  24. +31 −0 apps/dialer/js/settings_listener.js
  25. +53 −6 apps/dialer/locale/dialer.properties
  26. +15 −1 apps/dialer/manifest.json
  27. 0 apps/{homescreen → dialer}/style/ringtones/README
  28. BIN apps/{homescreen → dialer}/style/ringtones/bosscaling.wav
  29. BIN apps/dialer/style/ringtones/classic.wav
  30. BIN apps/{homescreen → dialer}/style/ringtones/goodnight.wav
  31. +1 −0 apps/gallery/index.html
  32. +806 −0 apps/gallery/js/GestureDetector.js
  33. +509 −0 apps/gallery/js/SyntheticGestures.js
  34. +540 −126 apps/gallery/js/gallery.js
  35. +9 −0 apps/gallery/locale/gallery.properties
  36. +14 −2 apps/gallery/manifest.json
  37. BIN apps/gallery/sample_photos/3548856279_a215152cd5_o.jpg
  38. BIN apps/gallery/sample_photos/3549661880_0c5565a518_o.jpg
  39. BIN apps/gallery/sample_photos/3549662882_8e41d11d28_o.jpg
  40. BIN apps/gallery/sample_photos/3551599565_db282cf840_o.jpg
  41. BIN apps/gallery/sample_photos/6839255446_2f245d8f0c.jpg
  42. BIN apps/gallery/sample_photos/6985376089_db00e0d18c_o.jpg
  43. BIN apps/gallery/sample_photos/DSC_1677.jpg
  44. BIN apps/gallery/sample_photos/DSC_1701.jpg
  45. BIN apps/gallery/sample_photos/DSC_1727.jpg
  46. BIN apps/gallery/sample_photos/DSC_1729.jpg
  47. BIN apps/gallery/sample_photos/DSC_1759.jpg
  48. BIN apps/gallery/sample_photos/DSC_4236.jpg
  49. BIN apps/gallery/sample_photos/DSC_4767.jpg
  50. BIN apps/gallery/sample_photos/DSC_4858.jpg
  51. BIN apps/gallery/sample_photos/DSC_4861.jpg
  52. BIN apps/gallery/sample_photos/DSC_4903.jpg
  53. BIN apps/gallery/sample_photos/DSC_7150.jpg
  54. BIN apps/gallery/sample_photos/IMG_0139.jpg
  55. BIN apps/gallery/sample_photos/IMG_0160.jpg
  56. BIN apps/gallery/sample_photos/IMG_0211.jpg
  57. BIN apps/gallery/sample_photos/IMG_0225.jpg
  58. BIN apps/gallery/sample_photos/IMG_0251.jpg
  59. BIN apps/gallery/sample_photos/IMG_0281.jpg
  60. BIN apps/gallery/sample_photos/IMG_0476.jpg
  61. BIN apps/gallery/sample_photos/IMG_0498.jpg
  62. BIN apps/gallery/sample_photos/IMG_0506.jpg
  63. BIN apps/gallery/sample_photos/thumbnails/3548856279_a215152cd5_o.jpg
  64. BIN apps/gallery/sample_photos/thumbnails/3549661880_0c5565a518_o.jpg
  65. BIN apps/gallery/sample_photos/thumbnails/3549662882_8e41d11d28_o.jpg
  66. BIN apps/gallery/sample_photos/thumbnails/3551599565_db282cf840_o.jpg
  67. BIN apps/gallery/sample_photos/thumbnails/6839255446_2f245d8f0c.jpg
  68. BIN apps/gallery/sample_photos/thumbnails/6985376089_db00e0d18c_o.jpg
  69. BIN apps/gallery/sample_photos/thumbnails/DSC_7150.jpg
  70. BIN apps/gallery/sample_photos/thumbnails/IMG_0139.jpg
  71. BIN apps/gallery/sample_photos/thumbnails/IMG_0160.jpg
  72. BIN apps/gallery/sample_photos/thumbnails/IMG_0211.jpg
  73. BIN apps/gallery/sample_photos/thumbnails/IMG_0225.jpg
  74. BIN apps/gallery/sample_photos/thumbnails/IMG_0251.jpg
  75. BIN apps/gallery/sample_photos/thumbnails/IMG_0281.jpg
  76. BIN apps/gallery/sample_photos/thumbnails/IMG_0476.jpg
  77. BIN apps/gallery/sample_photos/thumbnails/IMG_0498.jpg
  78. BIN apps/gallery/sample_photos/thumbnails/IMG_0506.jpg
  79. +18 −10 apps/gallery/style/gallery.css
  80. +0 −125,946 apps/homescreen/imes/jszhuyin/phrases.json
  81. +0 −14,175 apps/homescreen/imes/jszhuyin/words.json
  82. +15 −100 apps/homescreen/index.html
  83. +0 −15 apps/homescreen/js/app_manager.js
  84. +41 −1,192 apps/homescreen/js/homescreen.js
  85. +50 −24 apps/homescreen/js/request.js
  86. +54 −0 apps/homescreen/js/settings.js
  87. +12 −1 apps/homescreen/manifest.json
  88. BIN apps/homescreen/style/{themes/default → }/backgrounds/default.png
  89. BIN apps/homescreen/style/{themes/default → }/backgrounds/leaves.png
  90. BIN apps/homescreen/style/{themes/default → }/backgrounds/water.png
  91. BIN apps/homescreen/style/{themes/default → }/fonts/Open-Sans-Bold.woff
  92. BIN apps/homescreen/style/{themes/default → }/fonts/Open-Sans-Semibold.woff
  93. BIN apps/homescreen/style/{themes/default → }/fonts/Open-Sans.woff
  94. +68 −330 apps/homescreen/style/homescreen.css
  95. +42 −0 apps/homescreen/style/request.css
  96. BIN apps/homescreen/style/ringtones/classic.wav
  97. BIN apps/homescreen/style/themes/default/images/sleep/vibration.png
  98. 0 apps/homescreen/style/themes/default/statusbar.css
  99. +13 −1 apps/market/manifest.json
  100. +12 −0 apps/music/manifest.json
  101. +28 −0 apps/settings/index.html
  102. +1 −1 apps/settings/js/settings.js
  103. +282 −30 apps/settings/locale/settings.properties
  104. +14 −2 apps/settings/manifest.json
  105. +4 −4 apps/sms/js/sms.js
  106. +9 −0 apps/sms/js/utils.js
  107. +19 −1 apps/sms/locale/sms.properties
  108. +14 −2 apps/sms/manifest.json
  109. +1 −0 apps/{homescreen → system}/blank.html
  110. +127 −0 apps/system/index.html
  111. +12 −11 apps/{homescreen → system}/js/background_service.js
  112. +87 −0 apps/system/js/bookmarks/bookmarks.js
  113. 0 apps/{homescreen/js → system/js/bookmarks}/bookmarks.json
  114. +414 −0 apps/system/js/bootstrap.js
  115. +93 −0 apps/system/js/dialogs/request.js
  116. 0 apps/{homescreen → system/js/keyboard}/imes/jspinyin/COPYING
  117. 0 apps/{homescreen → system/js/keyboard}/imes/jspinyin/db.json
  118. 0 apps/{homescreen → system/js/keyboard}/imes/jspinyin/jspinyin.js
  119. 0 apps/{homescreen → system/js/keyboard}/imes/jszhuyin/README
  120. 0 apps/{homescreen → system/js/keyboard}/imes/jszhuyin/jszhuyin.js
  121. +128,060 −0 apps/system/js/keyboard/imes/jszhuyin/phrases.json
  122. 0 apps/{homescreen → system/js/keyboard}/imes/jszhuyin/tools/cook.js
  123. 0 apps/{homescreen → system/js/keyboard}/imes/jszhuyin/tools/cook.sh
  124. +14,178 −0 apps/system/js/keyboard/imes/jszhuyin/words.json
  125. +34 −36 apps/{homescreen/js → system/js/keyboard}/keyboard.js
  126. +23 −0 apps/{homescreen/js/keyboardLayout.js → system/js/keyboard/layout.js}
  127. +185 −0 apps/system/js/lockscreen/lockscreen.js
  128. +110 −0 apps/system/js/settings.js
  129. +363 −0 apps/system/js/statusbar/statusbar.js
  130. +6 −4 apps/{homescreen/js → system/js/windows}/window_manager.js
  131. +78 −12 apps/{homescreen/locale/homescreen.properties → system/locale/system.properties}
  132. +53 −0 apps/system/manifest.json
  133. +42 −0 apps/system/style/dialogs/request.css
  134. BIN apps/{homescreen → system}/style/images/grid.png
  135. 0 apps/{homescreen → system}/style/keyboard/fonts/Keyboard-Symbols.svg
  136. BIN apps/{homescreen → system}/style/keyboard/fonts/Keyboard-Symbols.woff
  137. BIN apps/{homescreen → system}/style/keyboard/images/left-accent.png
  138. BIN apps/{homescreen → system}/style/keyboard/images/left-active-accent.png
  139. BIN apps/{homescreen → system}/style/keyboard/images/left-active.png
  140. BIN apps/{homescreen → system}/style/keyboard/images/left-special.png
  141. BIN apps/{homescreen → system}/style/keyboard/images/left.png
  142. BIN apps/{homescreen → system}/style/keyboard/images/middle-special.png
  143. BIN apps/{homescreen → system}/style/keyboard/images/middle.png
  144. BIN apps/{homescreen → system}/style/keyboard/images/right-accent.png
  145. BIN apps/{homescreen → system}/style/keyboard/images/right-active-accent.png
  146. BIN apps/{homescreen → system}/style/keyboard/images/right-active.png
  147. BIN apps/{homescreen → system}/style/keyboard/images/right-special.png
  148. BIN apps/{homescreen → system}/style/keyboard/images/right.png
  149. 0 apps/{homescreen → system}/style/keyboard/keyboard.css
  150. +26 −0 apps/system/style/lockscreen/lockscreen.css
  151. BIN apps/{homescreen/style/images → system/style/statusbar}/notifications.png
  152. +106 −0 apps/system/style/statusbar/statusbar.css
  153. +204 −0 apps/system/style/system.css
  154. BIN apps/system/style/themes/default/fonts/Open-Sans-Bold.woff
  155. BIN apps/system/style/themes/default/fonts/Open-Sans-Semibold.woff
  156. BIN apps/system/style/themes/default/fonts/Open-Sans.woff
  157. BIN ...en/style/themes/default/images → system/style/themes/default/images/battery}/battery-charging.png
  158. BIN ...screen/style/themes/default/images → system/style/themes/default/images/battery}/battery-main.png
  159. BIN apps/{homescreen → system}/style/themes/default/images/grippy.png
  160. BIN ...mes/default/backgrounds/rings.png → system/style/themes/default/images/lockscreen/background.png}
  161. BIN apps/{homescreen → system}/style/themes/default/images/noise.png
  162. BIN ...hemes/default/images → system/style/themes/default/images/notifications}/desktop-notification.png
  163. BIN apps/{homescreen → system}/style/themes/default/images/sleep/airplane.png
  164. BIN apps/{homescreen → system}/style/themes/default/images/sleep/power-off.png
  165. BIN apps/{homescreen → system}/style/themes/default/images/sleep/restart.png
  166. BIN ...{homescreen/style/themes/default/images → system/style/themes/default/images/sleep}/vibration.png
  167. BIN ...mescreen/style/themes/default/images → system/style/themes/default/images/tasks}/close-active.png
  168. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/tasks}/close.png
  169. BIN apps/system/style/themes/default/images/volume/vibration.png
  170. BIN ...omescreen/style/themes/default/images → system/style/themes/default/images/volume}/volume-off.png
  171. BIN ...homescreen/style/themes/default/images → system/style/themes/default/images/volume}/volume-on.png
  172. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/wifi}/wifi-0.png
  173. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/wifi}/wifi-1.png
  174. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/wifi}/wifi-2.png
  175. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/wifi}/wifi-3.png
  176. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/wifi}/wifi-4.png
  177. BIN apps/{homescreen/style/themes/default/images → system/style/themes/default/images/wifi}/wifi.png
  178. +16 −143 apps/{homescreen/style/themes/default/homescreen.css → system/style/themes/default/system.css}
  179. +115 −21 apps/tasks/locale/tasks.properties
  180. +40 −8 apps/tasks/manifest.json
  181. +16 −0 apps/test-agent/index.html
  182. +15 −0 apps/test-agent/js/lib.js
  183. +18 −0 apps/test-agent/manifest.json
  184. +33 −0 apps/test-agent/sandbox.html
  185. +6 −0 apps/test-agent/test/config.json
  186. +35 −0 apps/test-agent/test/device/drive_test.js
  187. +49 −0 apps/test-agent/test/index.html
  188. +15 −0 apps/test-agent/test/lib_test.js
  189. +31 −0 apps/test-agent/test/sandbox.html
  190. +5 −0 apps/uitest/data/fakecontacts/LICENSE
  191. +18,004 −0 apps/uitest/data/fakecontacts/fakecontacts.json
  192. +1 −0 apps/uitest/index.html
  193. +100 −0 apps/uitest/js/contacts.js
  194. +27 −0 apps/uitest/tests/contacts.html
  195. +1 −0 apps/video/index.html
  196. +31 −0 apps/video/js/video.js
  197. +9 −0 apps/video/locale/video.properties
  198. +12 −0 apps/video/manifest.json
  199. +50 −0 apps/video/samples/manifesto.json
  200. +1 −0 apps/video/samples/meetthecubs.json
  201. +16 −0 apps/video/style/controls.css
  202. +153 −0 build/install-gaia.py
  203. 0 { → build}/offline-cache.js
  204. +6 −1 { → build}/preferences.js
  205. +59 −0 common/test/agent.js
  206. +74 −0 common/test/helper.js
  207. +34 −0 common/test/marionette.js
  208. +69 −0 common/test/mocha-generators.js
  209. +71 −0 common/test/mocha-task.js
  210. +49 −0 common/test/style/style.css
  211. +36 −0 common/test/test-url-resolver.js
  212. +2,229 −0 common/vendor/chai/chai.js
  213. +1,615 −0 common/vendor/marionette-client/marionette.js
  214. +137 −0 common/vendor/mocha/mocha.css
  215. +4,068 −0 common/vendor/mocha/mocha.js
  216. +68 −0 common/vendor/test-agent/test-agent.css
  217. +1,877 −0 common/vendor/test-agent/test-agent.js
  218. +8 −12 tools/extensions/httpd/content/httpd.js
  219. +286 −4 tools/extensions/httpd/content/loader.js
  220. +2 −2 tools/extensions/httpd/install.rdf
  221. +10 −0 tools/test-agent/package.json
  222. +16 −0 tools/test-agent/test-agent-server.js
  223. +2 −0 webapi.js
View
@@ -8,3 +8,4 @@ apps/settings/gaia-commit.txt
profile/
xulrunner/
xulrunner-sdk/
+node_modules
View
@@ -1,30 +1,13 @@
-Copyright (c) 2012, Mozilla. All rights reserved.
+Copyright 2012, Mozilla Foundation
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the following
-conditions are met:
+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
-* Redistributions of source code must retain the above
- copyright notice, this list of conditions and the
- following disclaimer.
+ http://www.apache.org/licenses/LICENSE-2.0
-* Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-* Neither the name of Mozilla. nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission of Mozilla.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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.
View
@@ -11,13 +11,37 @@
# DEBUG : debug mode enables mode output on the console and disable the #
# the offline cache. This is mostly for desktop debugging. #
# #
+# REPORTER : Mocha reporter to use for test output. #
+# #
+###############################################################################
+GAIA_DOMAIN?=gaiamobile.org
+
+ADB?=adb
+
+DEBUG?=0
+
+REPORTER=Spec
+
+
+###############################################################################
+# The above rules generate the profile/ folder and all its content. #
+# The profile folder content depends on different rules: #
+# 1. manifests #
+# A directory structure representing the applications installed using the #
+# Apps API. In Gaia all applications use this method. #
+# See https://developer.mozilla.org/en/Apps/Apps_JavaScript_API #
+# #
+# 2. offline #
+# An Application Cache database containing Gaia apps, so the phone can be #
###############################################################################
GAIA_DOMAIN?=gaiamobile.org
ADB?=adb
DEBUG?=0
+REPORTER=Spec
+
###############################################################################
# The above rules generate the profile/ folder and all its content. #
@@ -44,9 +68,9 @@ DEBUG?=0
# by editing /etc/hosts on linux/mac. This steps would not be required
# anymore once https://bugzilla.mozilla.org/show_bug.cgi?id=722197 will land.
ifeq ($(DEBUG),1)
-GAIA_PORT=:8080
+GAIA_PORT?=:8080
else
-GAIA_PORT=
+GAIA_PORT?=
endif
@@ -63,6 +87,16 @@ SED_INPLACE_NO_SUFFIX = sed -i
DOWNLOAD_CMD = wget
endif
+# Test agent setup
+TEST_AGENT_DIR=tools/test-agent/
+ifeq ($(strip $(NODEJS)),)
+ NODEJS := `which node`
+endif
+
+ifeq ($(strip $(NPM)),)
+ NPM := `which npm`
+endif
+
#Marionette testing variables
#make sure we're python 2.7.x
ifeq ($(strip $(PYTHON_27)),)
@@ -110,12 +144,15 @@ manifests:
# Generate profile/OfflineCache/
offline: install-xulrunner
+ifneq ($(DEBUG),1)
@echo "Building offline cache"
@rm -rf profile/OfflineCache
@mkdir -p profile/OfflineCache
@cd ..
- $(XULRUNNER) $(XPCSHELL) -e 'const GAIA_DIR = "$(CURDIR)"; const PROFILE_DIR = "$(CURDIR)/profile"; const GAIA_DOMAIN = "$(GAIA_DOMAIN)$(GAIA_PORT)"' offline-cache.js
+ $(XULRUNNER) $(XPCSHELL) -e 'const GAIA_DIR = "$(CURDIR)"; const PROFILE_DIR = "$(CURDIR)/profile"; const GAIA_DOMAIN = "$(GAIA_DOMAIN)$(GAIA_PORT)"' build/offline-cache.js
@echo "Done"
+endif
+
# The install-xulrunner target arranges to get xulrunner downloaded and sets up
# some commands for invoking it. But it is platform dependent
@@ -137,15 +174,15 @@ XULRUNNER_DOWNLOAD=http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/11.
XULRUNNER=./xulrunner/run-mozilla.sh
XPCSHELL=./xulrunner/xpcshell
-install-xulrunner:
+install-xulrunner :
test -d xulrunner || ($(DOWNLOAD_CMD) $(XULRUNNER_DOWNLOAD) && tar xjf xulrunner*.tar.bz2 && rm xulrunner*.tar.bz2)
endif
# Generate profile/prefs.js
preferences: install-xulrunner
@echo "Generating prefs.js..."
@mkdir -p profile
- $(XULRUNNER) $(XPCSHELL) -e 'const GAIA_DIR = "$(CURDIR)"; const PROFILE_DIR = "$(CURDIR)/profile"; const GAIA_DOMAIN = "$(GAIA_DOMAIN)$(GAIA_PORT)"; const DEBUG = $(DEBUG)' preferences.js
+ $(XULRUNNER) $(XPCSHELL) -e 'const GAIA_DIR = "$(CURDIR)"; const PROFILE_DIR = "$(CURDIR)/profile"; const GAIA_DOMAIN = "$(GAIA_DOMAIN)$(GAIA_PORT)"; const DEBUG = $(DEBUG)' build/preferences.js
@echo "Done"
@@ -185,6 +222,36 @@ tests: manifests offline
test -L $(INJECTED_GAIA) || ln -s $(CURDIR) $(INJECTED_GAIA)
TEST_PATH=$(TEST_PATH) make -C $(MOZ_OBJDIR) mochitest-browser-chrome EXTRA_TEST_ARGS="--browser-arg=\"\" --extra-profile-file=$(CURDIR)/profile/webapps --extra-profile-file=$(CURDIR)/profile/OfflineCache --extra-profile-file=$(CURDIR)/profile/user.js"
+.PHONY: common-install
+common-install:
+ @test -x $(NODEJS) || (echo "Please Install NodeJS -- (use aptitude on linux or homebrew on osx)" && exit 1 )
+ @test -x $(NPM) || (echo "Please install NPM (node package manager) -- http://npmjs.org/" && exit 1 )
+
+ cd $(TEST_AGENT_DIR) && npm install .
+
+.PHONY: update-common
+update-common: common-install
+ mkdir -p common/vendor/test-agent/
+ mkdir -p common/vendor/marionette-client/
+ mkdir -p common/vendor/chai/
+ rm -f common/vendor/test-agent/test-agent*.js
+ rm -f common/vendor/marionette-client/*.js
+ rm -f common/vendor/chai/*.js
+ cp $(TEST_AGENT_DIR)/node_modules/test-agent/test-agent.js common/vendor/test-agent/
+ cp $(TEST_AGENT_DIR)/node_modules/test-agent/test-agent.css common/vendor/test-agent/
+ cp $(TEST_AGENT_DIR)/node_modules/marionette-client/marionette.js common/vendor/marionette-client/
+ cp $(TEST_AGENT_DIR)/node_modules/chai/chai.js common/vendor/chai/
+
+# Temp make file method until we can switch
+# over everything in test
+.PHONY: test-agent-test
+test-agent-test:
+ @$(TEST_AGENT_DIR)/node_modules/test-agent/bin/js-test-agent test --reporter $(REPORTER)
+
+.PHONY: test-agent-server
+test-agent-server: common-install
+ $(TEST_AGENT_DIR)/node_modules/test-agent/bin/js-test-agent server -c ./$(TEST_AGENT_DIR)/test-agent-server.js --http-path . --growl
+
.PHONY: marionette
marionette:
#need the profile
@@ -262,19 +329,20 @@ update-offline-manifests:
fi \
done
-
# If your gaia/ directory is a sub-directory of the B2G directory, then
# you should use the install-gaia target of the B2G Makefile. But if you're
# working on just gaia itself, and you already have B2G firmware on your
# phone, and you have adb in your path, then you can use the install-gaia
# target to update the gaia files and reboot b2g
+PROFILE_PATH = /data/b2g/mozilla/`$(ADB) shell ls -1 /data/b2g/mozilla/ | grep default | tr -d [:cntrl:]`
install-gaia: profile
$(ADB) start-server
- $(ADB) shell rm -r /data/local/*
$(ADB) shell rm -r /cache/*
- # just push the profile
- $(ADB) push profile/OfflineCache /data/local/OfflineCache
- $(ADB) push profile/webapps /data/local/webapps
+ python build/install-gaia.py "$(ADB)"
+
+ # Until bug 746121 lands, push user.js in the profile
+ $(ADB) push profile/user.js ${PROFILE_PATH}/user.js
+
@echo "Installed gaia into profile/."
$(ADB) shell kill $(shell $(ADB) shell toolbox ps | grep "b2g" | awk '{ print $$2; }')
@echo 'Rebooting b2g now'
@@ -6,13 +6,16 @@
<title>Browser</title>
<link rel="stylesheet" href="style/browser.css" type="text/css" />
+ <script type="text/javascript" src="js/session_history.js"></script>
+ <script type="text/javascript" src="js/global_history.js"></script>
<script type="text/javascript" src="js/browser.js"></script>
</head>
<body>
<menu type="toolbar" id="toolbar-start">
- <form id="address-bar">
- <input type="url" id="url-bar" value="http://www.google.com/m"></input>
+ <form id="url-bar">
+ <input type="url" id="url-input" value="http://www.google.com/m"></input>
+ <input type="image" id="url-button" src="style/images/go.png"></input>
</form>
</menu>
<iframe id="browser-content" mozbrowser>
@@ -22,11 +25,6 @@
<menu type="toolbar" id="toolbar-end">
<button type="button" value="" id="back-button" alt="Back" title="" disabled="true"></button>
<button type="button" value="" id="forward-button" alt="Forward" title="" disabled="true"></button>
- <button type="button" value="" id="menu-button" alt="Menu" title=""></button>
- <menu type="list" id="browser-menu" class="hidden">
- <li id="refresh"><a href="#">Reload</a></li>
- </menu>
- </menu>
</body>
</html>
Oops, something went wrong.

0 comments on commit 3bf5a25

Please sign in to comment.