Title: [172077] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172077
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 14:14:26 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r172047. <rdar://problem/17879156>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172076 => 172077)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:12:50 UTC (rev 172076)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:14:26 UTC (rev 172077)
@@ -1,5 +1,25 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r172047
+
+ 2014-08-05 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 Antoine Quint.
+
+ Antoine found me on iMessage to tell me I'm an idiot and that I've
+ forgotten how to write _javascript_. Embarrassingly, this code is what
+ I originally had, but then second-guessed myself.
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.updateWirelessPlaybackStatus): No need for the local
+ variable or conditional statement, since null and "" both evaluate as false.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171944
2014-07-31 Dean Jackson <d...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (172076 => 172077)
--- branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-08-05 21:12:50 UTC (rev 172076)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-08-05 21:14:26 UTC (rev 172077)
@@ -110,11 +110,8 @@
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##', externalDeviceDisplayName);
+ deviceName = this.UIString('##WIRELESS_PLAYBACK_DEVICE_NAME##', '##DEVICE_NAME##', this.host.externalDeviceDisplayName || "Apple TV");
} else if (type == "tvout") {
deviceType = this.UIString('##TVOUT_DEVICE_TYPE##');
deviceName = this.UIString('##TVOUT_DEVICE_NAME##');
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
