This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/music/js/music.js b/apps/music/js/music.js | |
index 2f1923a..c55eea5 100644 | |
--- a/apps/music/js/music.js | |
+++ b/apps/music/js/music.js | |
@@ -307,7 +307,6 @@ var MODE_SUBLIST = 3; | |
var MODE_PLAYER = 4; | |
var MODE_SEARCH_FROM_TILES = 5; | |
var MODE_SEARCH_FROM_LIST = 6; | |
-var UI_SIZE_SEGMENTS = window.innerWidth / 3; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/music/js/music.js b/apps/music/js/music.js | |
index 2f1923a..c55eea5 100644 | |
--- a/apps/music/js/music.js | |
+++ b/apps/music/js/music.js | |
@@ -307,7 +307,6 @@ var MODE_SUBLIST = 3; | |
var MODE_PLAYER = 4; | |
var MODE_SEARCH_FROM_TILES = 5; | |
var MODE_SEARCH_FROM_LIST = 6; | |
-var UI_SIZE_SEGMENTS = window.innerWidth / 3; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/communications/dialer/js/oncall.js b/apps/communications/dialer/js/oncall.js | |
index b45db90..bce8592 100644 | |
--- a/apps/communications/dialer/js/oncall.js | |
+++ b/apps/communications/dialer/js/oncall.js | |
@@ -279,6 +279,10 @@ var OnCallHandler = (function onCallHandler() { | |
}); | |
if (!stillHere) { | |
+ console.log('current calls:' + telephony.calls.length); | |
+ telephony.calls.forEach(function print(call) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/camera/js/camera.js b/apps/camera/js/camera.js | |
index a80e013..3e01caa 100644 | |
--- a/apps/camera/js/camera.js | |
+++ b/apps/camera/js/camera.js | |
@@ -911,9 +911,8 @@ var Camera = { | |
this._previewConfig = camera.capabilities.previewSizes[0]; | |
} | |
- var transform = 'rotate(90deg)'; | |
+ var transform = 'rotate(-90deg)'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 7135119..487c24b 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -400,7 +400,7 @@ GAIA_APP_CONFIG := /tmp/gaia-apps-temp.list | |
$(warning GAIA_APP_SRCDIRS is deprecated, please use GAIA_APP_CONFIG) | |
endif | |
-GAIA_ALLAPPDIRS=$(shell find $(GAIA_DIR)$(SEP)apps $(GAIA_DIR)$(SEP)dev_apps -maxdepth 1 -mindepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g') | |
+GAIA_ALLAPPDIRS=$(shell find $(GAIA_DIR)$(SEP)apps $(GAIA_DIR)$(SEP)dev_apps $(GAIA_DIR)$(SEP)tv_apps -maxdepth 1 -mindepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/system/js/app_window_factory.js b/apps/system/js/app_window_factory.js | |
index 59fb9f3..e4a5a72 100644 | |
--- a/apps/system/js/app_window_factory.js | |
+++ b/apps/system/js/app_window_factory.js | |
@@ -1,5 +1,6 @@ | |
'use strict'; | |
-/* global applications, BrowserConfigHelper, AppWindow */ | |
+/* globals applications, BrowserConfigHelper, AppWindow, | |
+ WrapperFactory */ | |
/* jshint nonew: false */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/themes/shared/commonProgressmeter.inc.css b/browser/themes/shared/commonProgressmeter.inc.css | |
new file mode 100644 | |
index 0000000..2c7a097 | |
--- /dev/null | |
+++ b/browser/themes/shared/commonProgressmeter.inc.css | |
@@ -0,0 +1,62 @@ | |
+/*** Common-styled progressmeter ***/ | |
+.downloadProgress { | |
+ height: 8px; | |
+ border-radius: 1px; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/themes/osx/downloads/allDownloadsViewOverlay.css b/browser/themes/osx/downloads/allDownloadsViewOverlay.css | |
index 94b99a7..1e8dcd6 100644 | |
--- a/browser/themes/osx/downloads/allDownloadsViewOverlay.css | |
+++ b/browser/themes/osx/downloads/allDownloadsViewOverlay.css | |
@@ -9,3 +9,7 @@ | |
:root { | |
--downloads-item-height: 6em; | |
} | |
+ | |
+.downloadProgress > .progress-bar { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/components/downloads/content/indicator.js b/browser/components/downloads/content/indicator.js | |
index 4c22a6e..3fc3176 100644 | |
--- a/browser/components/downloads/content/indicator.js | |
+++ b/browser/components/downloads/content/indicator.js | |
@@ -284,6 +284,8 @@ const DownloadsIndicatorView = { | |
*/ | |
_notificationTimeout: null, | |
+ _anchorNotificationTimeout: null, | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/extensions/mortar/host/common/ppapi-runtime.jsm b/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
index d680fe0..f59c6e3 100644 | |
--- a/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
+++ b/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
@@ -11,6 +11,7 @@ const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components; | |
Cu.import("resource://gre/modules/ctypes.jsm"); | |
Cu.import("resource://gre/modules/Services.jsm"); | |
Cu.import("resource://ppapi.js/opengles2-utils.jsm"); | |
+Cu.importGlobalProperties(['URL']); | |
OlderNewer