Bug 1260811 - Land version 1.2.4 of the Loop system add-on in mozilla-central. rs=Standard8 for already reviewed code.

This commit is contained in:
Mark Banner 2016-03-30 18:16:57 +01:00
Родитель f3c1e51f7d
Коммит b61baddd6c
15 изменённых файлов: 141 добавлений и 49 удалений

Просмотреть файл

@ -30,7 +30,6 @@
}
.room-invitation-content > * {
width: 100%;
margin: 0 15px;
}
@ -230,10 +229,6 @@ html[dir="rtl"] .share-panel-container > .room-invitation-overlay {
margin: 0 0 12px;
}
.share-panel-container > .room-invitation-overlay > .room-invitation-content > * {
width: initial;
}
.share-panel-open > .room-invitation-overlay,
html[dir="rtl"] .share-panel-open > .room-invitation-overlay {
transform: translateX(0);

Просмотреть файл

@ -1091,12 +1091,12 @@ loop.panel = function (_, mozL10n) {
handleClosePanel: function () {
this.props.onSharePanelDisplayChange();
this.openRoom();
this.closeWindow();
this.setState({
showPanel: false
});
this.openRoom();
this.closeWindow();
},
openRoom: function () {

Просмотреть файл

@ -356,6 +356,7 @@ loop.roomViews = function (mozL10n) {
screenShareMediaElement: this.state.screenShareMediaElement,
screenSharePosterUrl: null,
showInitialContext: false,
showMediaWait: false,
showTile: false },
React.createElement(sharedViews.ConversationToolbar, {
audio: { enabled: !this.state.audioMuted, visible: true },

Просмотреть файл

@ -1,7 +1,12 @@
pref("loop.enabled", true);
pref("loop.remote.autostart", true);
#ifdef LOOP_DEV_XPI
pref("loop.server", "https://loop-dev.stage.mozaws.net/v0");
pref("loop.linkClicker.url", "https://loop-webapp-dev.stage.mozaws.net/");
#else
pref("loop.server", "https://loop.services.mozilla.com/v0");
pref("loop.linkClicker.url", "https://hello.firefox.com/");
#endif
pref("loop.gettingStarted.latestFTUVersion", 1);
pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start/");
pref("loop.gettingStarted.resumeOnFirstJoin", false);

Просмотреть файл

@ -510,40 +510,74 @@ html, .fx-embedded, #main,
width: 272px;
}
.media-wrapper.showing-local-streams > .text-chat-view {
.media-wrapper > .text-chat-view > .text-chat-entries > .text-chat-scroller > .welcome-message {
font-size: 1.2rem;
margin: 0 0 15px;
color: #5e5f64;
line-height: 20px;
}
.media-wrapper.showing-local-streams > .text-chat-view,
.media-wrapper.showing-media-wait > .text-chat-view {
/* When we're displaying the local streams, then we need to make the text
chat view a bit shorter to give room. */
height: calc(100% - 204px);
}
.media-wrapper.showing-media-wait > .text-chat-view {
order: 2;
}
.media-wrapper.showing-media-wait > .local {
/* Hides the local stream video box while we're asking the user for permissions */
display: none;
}
.media-wrapper.showing-local-streams.receiving-screen-share {
position: relative;
}
.media-wrapper.showing-local-streams.receiving-screen-share > .text-chat-view {
/* When we're displaying the local streams, then we need to make the text
chat view a bit shorter to give room. 2 streams x 204px each*/
height: calc(100% - 408px);
chat view a bit shorter to give room. 1 streams x 204px */
height: calc(100% - 204px);
}
.media-wrapper.receiving-screen-share > .screen {
order: 1;
}
.media-wrapper.receiving-screen-share > .text-chat-view {
order: 2;
.media-wrapper.receiving-screen-share > .text-chat-view,
.media-wrapper.showing-local-streams > .text-chat-view {
order: 4;
}
.media-wrapper.receiving-screen-share > .remote {
flex: 0 1 auto;
order: 3;
order: 2;
/* to keep the 4:3 ratio set both height and width */
height: 204px;
width: 272px;
}
.media-wrapper.receiving-screen-share > .local {
order: 4;
order: 3;
}
.media-wrapper.receiving-screen-share.showing-remote-streams > .local {
position: absolute;
z-index: 2;
padding: 8px;
right: 0;
left: auto;
top: 124px;
/* to keep the 4:3 ratio 80x60px + 16px padding + 4px border */
width: calc(80px + 16px + 4px);
height: calc(60px + 16px + 4px);
}
.media-wrapper.receiving-screen-share.showing-remote-streams > .local > .remote-video-box {
border: solid 2px #fff;
}
@media screen and (max-width:640px) {
@ -630,7 +664,7 @@ html, .fx-embedded, #main,
object-fit: contain;
}
.media-wrapper.receiving-screen-share > .local {
.media-wrapper.receiving-screen-share.showing-remote-streams > .local {
/* Screen shares have remote & local video side-by-side on narrow screens */
order: 3;
flex: 1 1 auto;
@ -641,13 +675,15 @@ html, .fx-embedded, #main,
max-width: 50%;
/* This cancels out the absolute positioning when it's just remote video. */
position: relative;
top: auto;
bottom: auto;
right: auto;
margin: 0;
padding: 0;
}
.media-wrapper.receiving-screen-share > .text-chat-view {
order: 4;
.media-wrapper.receiving-screen-share.showing-remote-streams > .local > .remote-video-box {
border: 0;
}
}

Просмотреть файл

@ -216,6 +216,11 @@ loop.shared.views.chat = function (mozL10n) {
React.createElement(
"div",
{ className: "text-chat-scroller" },
loop.shared.utils.isDesktop() ? null : React.createElement(
"p",
{ className: "welcome-message" },
mozL10n.get("rooms_welcome_text_chat_label", { clientShortname: mozL10n.get("clientShortname2") })
),
this.props.messageList.map(function (entry, i) {
if (entry.type === CHAT_MESSAGE_TYPES.SPECIAL) {
if (!this.props.showInitialContext) {

Просмотреть файл

@ -885,6 +885,7 @@ loop.shared.views = function (_, mozL10n) {
screenSharePosterUrl: React.PropTypes.string,
screenSharingPaused: React.PropTypes.bool,
showInitialContext: React.PropTypes.bool.isRequired,
showMediaWait: React.PropTypes.bool.isRequired,
showTile: React.PropTypes.bool.isRequired
},
@ -942,6 +943,30 @@ loop.shared.views = function (_, mozL10n) {
);
},
renderMediaWait: function () {
var msg = mozL10n.get("call_progress_getting_media_description", { clientShortname: mozL10n.get("clientShortname2") });
var utils = loop.shared.utils;
var isChrome = utils.isChrome(navigator.userAgent);
var isFirefox = utils.isFirefox(navigator.userAgent);
var isOpera = utils.isOpera(navigator.userAgent);
var promptMediaMessageClasses = classNames({
"prompt-media-message": true,
"chrome": isChrome,
"firefox": isFirefox,
"opera": isOpera,
"other": !isChrome && !isFirefox && !isOpera
});
return React.createElement(
"div",
{ className: "prompt-media-message-wrapper" },
React.createElement(
"p",
{ className: promptMediaMessageClasses },
msg
)
);
},
render: function () {
var remoteStreamClasses = classNames({
"remote": true,
@ -958,6 +983,7 @@ loop.shared.views = function (_, mozL10n) {
"media-wrapper": true,
"receiving-screen-share": this.props.displayScreenShare,
"showing-local-streams": this.props.localSrcMediaElement || this.props.localPosterUrl,
"showing-media-wait": this.props.showMediaWait,
"showing-remote-streams": this.props.remoteSrcMediaElement || this.props.remotePosterUrl || this.props.isRemoteLoading
});
@ -1003,7 +1029,8 @@ loop.shared.views = function (_, mozL10n) {
dispatcher: this.props.dispatcher,
showInitialContext: this.props.showInitialContext,
showTile: this.props.showTile }),
this.state.localMediaAboslutelyPositioned ? null : this.renderLocalVideo()
this.state.localMediaAboslutelyPositioned ? null : this.renderLocalVideo(),
this.props.showMediaWait ? this.renderMediaWait() : null
)
);
}

Просмотреть файл

@ -831,6 +831,7 @@ describe("loop.shared.views", function() {
matchMedia: window.matchMedia,
renderRemoteVideo: false,
showInitialContext: false,
showMediaWait: false,
showTile: false
};
@ -968,6 +969,24 @@ describe("loop.shared.views", function() {
expect(view.getDOMNode().querySelector(".media-wrapper")
.classList.contains("showing-remote-streams")).eql(true);
});
it("should mark the wrapper as showing media wait tile when asking for user media", function() {
view = mountTestComponent({
showMediaWait: true
});
expect(view.getDOMNode().querySelector(".media-wrapper")
.classList.contains("showing-media-wait")).eql(true);
});
it("should display a media wait tile when asking for user media", function() {
view = mountTestComponent({
showMediaWait: true
});
expect(view.getDOMNode().querySelector(".prompt-media-message-wrapper"))
.not.eql(null);
});
});
describe("RemoteCursorView", function() {

Просмотреть файл

@ -4,8 +4,6 @@
# Panel Strings
## LOCALIZATION_NOTE(loopMenuItem_label): Label of the menu item that is placed
## inside the browser 'Tools' menu. Use the unicode ellipsis char, \u2026, or
## use "..." if \u2026 doesn't suit traditions in your locale.
@ -44,8 +42,10 @@ fte_slide_1_title=صفحات وب را با یک دوست مرور کنید
## LOCALIZATION_NOTE(fte_slide_1_copy): {{clientShortname2}}
## will be replaced by the short name 2.
fte_slide_1_copy=اگر در حال برنامه‌ریزی برای یک سفر هستید یا قصد خرید یک هدیه را دارید، {{clientShortname2}} به شما اجازه می‌دهد تا زمانی کوتاه تصمیمات سریع‌تر بگیرید.
fte_slide_2_title=با هم هماهنگ باشید
fte_slide_2_copy=از سیستم گپ ویدئویی یا متنی برای به اشتراک گذاشتن ایده‌ها، مقایسه گزینه‌ها و رسیدن به تفاهم، استفاده کنید.
fte_slide_2_title2=ساخته شده برای اشتراک گذاری وب
## LOCALIZATION_NOTE(fte_slide_2_copy2): {{clientShortname2}}
## will be replaced by the short name 2.
fte_slide_2_copy2=حالا اگر یک دوست خود را به یک نشست دعوت کنید، {{clientShortname2}} بطور خودکار هر صفحه وبی که دیدن می‌کنید را به اشتراک می‌گذارد. باهم. برنامه‌ریزی کنید. خرید کنید. تصمیم بگیرد.
fte_slide_3_title=یک دوست را با ارسال یک پیوند دعوت کنید
## LOCALIZATION_NOTE(fte_slide_3_copy): {{clientSuperShortname}}
## will be replaced by the super short brand name.
@ -57,9 +57,7 @@ fte_slide_4_title=شمایل {{clientSuperShortname}} را برای شروع پ
## will be replaced by the brand short name.
fte_slide_4_copy=زمانی که صفحه‌ای پیدا کردید تا موردش بحث کنید، بر روی شمایل {{brandShortname}} کلیک کنید تا یک پیوند بسازید. سپس آن را هر طور که دوست دارید برای دوست خود ارسال کنید!
invite_header_text_bold=یک نفر را برای همراهی در مرور اینه صفحه دعوت کنید!
invite_header_text_bold2=از یک دوست برای پیوستن به شما دعوت کنید!
invite_header_text3=برای کار کردن با Firefox Hello باید دو نفر باشید، پس برای دوست خود یک پیوند بفرستید تا وب را با هم مرور کنید!
invite_header_text4=این پیوند را برای شروع مرور وب با هم به اشتراک بگذارید.
## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
## invite_email_link_button, invite_facebook_button2): These labels appear under
@ -107,6 +105,7 @@ share_add_service_button=اضافه کردن یک سرویس
## These menu items are displayed from a panel's context menu for a conversation.
copy_link_menuitem=رونوشت پیوند
email_link_menuitem=پست کردن پیوند
edit_name_menuitem=ویرایش نام
delete_conversation_menuitem2=حذف
panel_footer_signin_or_signup_link=ورود یا ثبت‌نام

Просмотреть файл

@ -34,7 +34,7 @@ first_time_experience_subheading_button_above=Cliquez sur le bouton ci-dessus po
## LOCALIZATION_NOTE(first_time_experience_content, first_time_experience_content2): Message describing
## ways to use Hello project.
first_time_experience_content=Utilisez-le pour vous organiser, travailler et rire ensemble.
first_time_experience_content2=Utilisez vous pour réaliser vos projets : vous organiser, travailler et rire ensemble.
first_time_experience_content2=Utilisez-le pour réaliser vos projets : vous organiser, travailler et rire ensemble.
first_time_experience_button_label2=Principe de fonctionnement
## First Time Experience Slides
@ -97,7 +97,7 @@ share_email_footer2=\n\n____________\nFirefox Hello vous permet de naviguer sur
## LOCALIZATION NOTE (share_tweeet): In this item, don't translate the part
## between {{..}}. Please keep the text below 117 characters to make sure it fits
## in a tweet.
share_tweet=Rejoignez-moi pour une conversation vidéo sur {{clientShortname2}} !
share_tweet=Rejoignez-moi pour une conversation vidéo sur {{clientShortname2}} !
share_add_service_button=Ajouter un service

Просмотреть файл

@ -4,8 +4,6 @@
# Panel Strings
## LOCALIZATION_NOTE(loopMenuItem_label): Label of the menu item that is placed
## inside the browser 'Tools' menu. Use the unicode ellipsis char, \u2026, or
## use "..." if \u2026 doesn't suit traditions in your locale.
@ -44,8 +42,10 @@ fte_slide_1_title=Menjelajahi laman Web bersama teman
## LOCALIZATION_NOTE(fte_slide_1_copy): {{clientShortname2}}
## will be replaced by the short name 2.
fte_slide_1_copy=Baik merencanakan perjalanan atau berbelanja hadiah, {{clientShortname2}} memungkinkan anda membuat keputusan lebih cepat dalam waktu singkat.
fte_slide_2_title=Memiliki pemahaman yang sama
fte_slide_2_copy=Menggunakan teks atau percakapan video yang tersedia untuk berbagi gagasan, emmbandingkan pilihan dan bermufakat.
fte_slide_2_title2=Dirancang untuk berbagi Web
## LOCALIZATION_NOTE(fte_slide_2_copy2): {{clientShortname2}}
## will be replaced by the short name 2.
fte_slide_2_copy2=Sekarang saat Anda mengundang teman ke sebuah sesi, {{clientShortname2}} akan otomatis bagikan laman Web yang sedang Anda lihat. Rencanakan. Belanja. Tentukan. Bersama.
fte_slide_3_title=Mengundang teman dengan mengirimkan tautan
## LOCALIZATION_NOTE(fte_slide_3_copy): {{clientSuperShortname}}
## will be replaced by the super short brand name.
@ -57,9 +57,7 @@ fte_slide_4_title=Temukan ikon {{clientSuperShortname}} untuk memulai
## will be replaced by the brand short name.
fte_slide_4_copy=Saat Anda menemukan laman yang ingin didiskusikan, klik ikon {{brandShortname}} untuk membuat tautan. Lalu kirimkan ke teman seperti yang Anda inginkan!
invite_header_text_bold=Undang seseorang untuk jelajahi laman ini bersama Anda!
invite_header_text_bold2=Mengundang teman untuk bergabung!
invite_header_text3=Membutuhkan 2 orang untuk menggunakan Firefox Hello, jadi kirimkan tautan ke teman untuk menjelajah Web bersama Anda!
invite_header_text4=Bagikan tautan ini supaya anda bisa mulai menjelajahi Web bersama.
## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
## invite_email_link_button, invite_facebook_button2): These labels appear under
@ -107,6 +105,7 @@ share_add_service_button=Tambah Layanan
## These menu items are displayed from a panel's context menu for a conversation.
copy_link_menuitem=Salin Tautan
email_link_menuitem=Kirim Tautan
edit_name_menuitem=Ubah nama
delete_conversation_menuitem2=Hapus
panel_footer_signin_or_signup_link=Masuk atau Daftar

Просмотреть файл

@ -4,8 +4,6 @@
# Panel Strings
## LOCALIZATION_NOTE(loopMenuItem_label): Label of the menu item that is placed
## inside the browser 'Tools' menu. Use the unicode ellipsis char, \u2026, or
## use "..." if \u2026 doesn't suit traditions in your locale.
@ -43,7 +41,8 @@ first_time_experience_button_label2=Бұл қалай жұмыс жасайты
fte_slide_1_title=Веб парақтарды досыңызбен бірге шолу
## LOCALIZATION_NOTE(fte_slide_1_copy): {{clientShortname2}}
## will be replaced by the short name 2.
fte_slide_2_title=Бір парақты ашыңыз
## LOCALIZATION_NOTE(fte_slide_2_copy2): {{clientShortname2}}
## will be replaced by the short name 2.
fte_slide_3_title=Досыңызды сөйлесуге оған сілтемені жіберу арқылы шақырыңыз
## LOCALIZATION_NOTE(fte_slide_3_copy): {{clientSuperShortname}}
## will be replaced by the super short brand name.
@ -52,8 +51,6 @@ fte_slide_3_title=Досыңызды сөйлесуге оған сілтеме
## LOCALIZATION_NOTE(fte_slide_4_copy): {{brandShortname}}
## will be replaced by the brand short name.
invite_header_text_bold=Біреуді бұл парақты сізбен бірге шолуға шақырыңыз!
invite_header_text3=Firefox Hello қолдану үшін екі адам керек, сондықтан, досыңызға интернетті бірге шолуға сілтемені жіберіңіз!
## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
## invite_email_link_button, invite_facebook_button2): These labels appear under
## an iconic button for the invite view.
@ -99,6 +96,7 @@ share_add_service_button=Қызметті қосу
## These menu items are displayed from a panel's context menu for a conversation.
copy_link_menuitem=Сілтемені көшіріп алу
email_link_menuitem=Сілтемені эл. поштамен жіберу
edit_name_menuitem=Атын түзету
delete_conversation_menuitem2=Өшіру
panel_footer_signin_or_signup_link=Кіру немесе тіркелгіні жасау
@ -246,6 +244,9 @@ rooms_room_joined_owner_not_connected_label=Сіздің досыңыз {{roomUR
self_view_hidden_message=Өздік көрініс жасырылған, бірақ, жіберілуде; көрсету үшін терезе өлшемін өзгертіңіз
peer_left_session=Досыңыз шықты.
peer_unexpected_quit=Досыңыз күтпегенде үзілген.
## LOCALIZATION NOTE (tos_failure_message): Don't translate {{clientShortname}}
## as this will be replaced by clientShortname2.
tos_failure_message={{clientShortname}} сіздің еліңізде қолжетерсіз.

Просмотреть файл

@ -4,8 +4,6 @@
# Panel Strings
## LOCALIZATION_NOTE(loopMenuItem_label): Label of the menu item that is placed
## inside the browser 'Tools' menu. Use the unicode ellipsis char, \u2026, or
## use "..." if \u2026 doesn't suit traditions in your locale.
@ -28,17 +26,27 @@ sign_in_again_use_as_guest_button2=Utilisar {{clientSuperShortname}} sco giast
panel_browse_with_friend_button=Navigar cun in ami en questa pagina
panel_disconnect_button=Deconnectar
## LOCALIZATION_NOTE(first_time_experience_subheading2): Message inviting the
## LOCALIZATION_NOTE(first_time_experience_subheading2, first_time_experience_subheading_button_above): Message inviting the
## user to create his or her first conversation.
first_time_experience_subheading2=Clicca sin il buttun da Hello per navigar cun in ami en il web.
## LOCALIZATION_NOTE(first_time_experience_content): Message describing
## LOCALIZATION_NOTE(first_time_experience_content, first_time_experience_content2): Message describing
## ways to use Hello project.
first_time_experience_content=Fa diever da la funcziun per planisar ensemen, lavurar ensemen, rir ensemen.
first_time_experience_button_label2=Mussar co che quai funcziunescha
invite_header_text_bold=Envida insatgi a navigar cun tai sin questa pagina!
invite_header_text3=I dovra dus per utilisar Firefox Hello. Trametta pia ina colliaziun ad in ami per ch'el possia navigar en il web cun tai!
## First Time Experience Slides
## LOCALIZATION_NOTE(fte_slide_1_copy): {{clientShortname2}}
## will be replaced by the short name 2.
## LOCALIZATION_NOTE(fte_slide_2_copy2): {{clientShortname2}}
## will be replaced by the short name 2.
## LOCALIZATION_NOTE(fte_slide_3_copy): {{clientSuperShortname}}
## will be replaced by the super short brand name.
## LOCALIZATION_NOTE(fte_slide_4_title): {{clientSuperShortname}}
## will be replaced by the super short brand name.
## LOCALIZATION_NOTE(fte_slide_4_copy): {{brandShortname}}
## will be replaced by the brand short name.
## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
## invite_email_link_button, invite_facebook_button2): These labels appear under
## an iconic button for the invite view.
@ -48,9 +56,6 @@ invite_email_link_button=Trametter la colliaziun via e-mail
invite_facebook_button3=Facebook
invite_your_link=Tia colliaziun:
# Status text
display_name_guest=Giast
# Error bars
## LOCALIZATION NOTE(session_expired_error_description,could_not_authenticate,password_changed_question,try_again_later,could_not_connect,check_internet_connection,login_expired,service_not_available,problem_accessing_account):
## These may be displayed at the top of the panel.

Просмотреть файл

@ -9,7 +9,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>loop@mozilla.org</em:id>
<em:bootstrap>true</em:bootstrap>
<em:version>1.2.2</em:version>
<em:version>1.2.4</em:version>
<em:type>2</em:type>
<!-- Target Application this extension can install into,

Просмотреть файл

@ -6,7 +6,7 @@
[features/loop@mozilla.org] chrome.jar:
% content loop %content/ contentaccessible=yes
% content loop-locale-fallback %content/locale-fallback/en-US/
% skin loop classic/1.0 %skin/linux/ os=Linux
% skin loop classic/1.0 %skin/linux/
% skin loop classic/1.0 %skin/osx/ os=Darwin
% skin loop classic/1.0 %skin/windows/ os=WINNT
% skin loop-shared classic/1.0 %skin/shared/