From e1ad7c63aff557e7a707a77d34944f08c52d82aa Mon Sep 17 00:00:00 2001 From: Calvin Montgomery Date: Mon, 9 Jan 2017 23:47:11 -0800 Subject: [PATCH] Clarify custom embed error to remove the clause about switching to plain HTTP --- package.json | 2 +- player/embed.coffee | 4 +--- www/js/player.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 633d67d5..91544367 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Calvin Montgomery", "name": "CyTube", "description": "Online media synchronizer and chat", - "version": "3.27.0", + "version": "3.27.1", "repository": { "url": "http://github.com/calzoneman/sync" }, diff --git a/player/embed.coffee b/player/embed.coffee index 30bb037a..7881b3d2 100644 --- a/player/embed.coffee +++ b/player/embed.coffee @@ -1,9 +1,7 @@ DEFAULT_ERROR = 'You are currently connected via HTTPS but the embedded content uses non-secure plain HTTP. Your browser therefore blocks it from loading due to mixed content policy. To fix this, embed the video using a - secure link if available (https://...), or load this page over plain HTTP by - replacing "https://" with "http://" in the address bar (your websocket will - still be secured using HTTPS, but this will permit non-secure content to load).' + secure link if available (https://...), or find another source for the content.' genParam = (name, value) -> $('').attr( diff --git a/www/js/player.js b/www/js/player.js index 5249b036..a30ee1b9 100644 --- a/www/js/player.js +++ b/www/js/player.js @@ -902,7 +902,7 @@ })(Player); - DEFAULT_ERROR = 'You are currently connected via HTTPS but the embedded content uses non-secure plain HTTP. Your browser therefore blocks it from loading due to mixed content policy. To fix this, embed the video using a secure link if available (https://...), or load this page over plain HTTP by replacing "https://" with "http://" in the address bar (your websocket will still be secured using HTTPS, but this will permit non-secure content to load).'; + DEFAULT_ERROR = 'You are currently connected via HTTPS but the embedded content uses non-secure plain HTTP. Your browser therefore blocks it from loading due to mixed content policy. To fix this, embed the video using a secure link if available (https://...), or find another source for the content.'; genParam = function(name, value) { return $('').attr({