Title: [172076] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172076
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 14:12:50 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171944. <rdar://problem/17879156>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172075 => 172076)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:10:40 UTC (rev 172075)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:12:50 UTC (rev 172076)
@@ -1,5 +1,27 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171944
+
+ 2014-07-31 Dean Jackson <d...@apple.com>
+
+ [Media iOS] Ensure there is a nice default fallback for missing wireless target names
+ https://bugs.webkit.org/show_bug.cgi?id=135488
+ <rdar://problem/17879156>
+
+ Reviewed by Eric Carlson.
+
+ We occasionally run into cases where this.host.externalDeviceDisplayName
+ is empty or null, creating a pretty ugly/confusing string in the
+ wireless playback status screen.
+
+ If this happens, we should default to using "Apple TV".
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.updateWirelessPlaybackStatus): Check if the externalDeviceDisplayName
+ is empty or null, and fall back to "Apple TV" if so.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171937
2014-08-01 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (172075 => 172076)
--- branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-08-05 21:10:40 UTC (rev 172075)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-08-05 21:12:50 UTC (rev 172076)
@@ -110,13 +110,16 @@
var deviceType = "";
var type = this.host.externalDeviceType;
if (type == "airplay") {
+ var externalDeviceDisplayName = this.host.externalDeviceDisplayName;
+ if (!externalDeviceDisplayName || externalDeviceDisplayName == "")
+ externalDeviceDisplayName = "Apple TV";
deviceType = this.UIString('##WIRELESS_PLAYBACK_DEVICE_TYPE##');
- deviceName = this.UIString('##WIRELESS_PLAYBACK_DEVICE_NAME##', '##DEVICE_NAME##', this.host.externalDeviceDisplayName);
+ deviceName = this.UIString('##WIRELESS_PLAYBACK_DEVICE_NAME##', '##DEVICE_NAME##', externalDeviceDisplayName);
} else if (type == "tvout") {
deviceType = this.UIString('##TVOUT_DEVICE_TYPE##');
deviceName = this.UIString('##TVOUT_DEVICE_NAME##');
}
-
+
backgroundImageSVG = backgroundImageSVG.replace('##DEVICE_TYPE##', deviceType);
backgroundImageSVG = backgroundImageSVG.replace('##DEVICE_NAME##', deviceName);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
