Bug 1081847 - Resize the Loop conversation window to 300w x 272h. r=mikedeboer

This commit is contained in:
Mark Banner 2015-02-24 13:17:30 +00:00
Родитель 94da6f9466
Коммит 473f5d1b9d
5 изменённых файлов: 37 добавлений и 29 удалений

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

@ -908,6 +908,11 @@ chatbox {
width: 260px; /* CHAT_WIDTH_OPEN in socialchat.xml */
}
chatbox[large="true"] {
width: 300px;
heigth: 272px;
}
chatbox[minimized="true"] {
width: 160px;
height: 20px; /* CHAT_WIDTH_MINIMIZED in socialchat.xml */

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

@ -463,7 +463,9 @@
// We can't use calcTotalWidthOf due to the transitions...
const CHAT_WIDTH_OPEN = 260;
const CHAT_WIDTH_MINIMIZED = 160;
return aChatbox.minimized ? CHAT_WIDTH_MINIMIZED : CHAT_WIDTH_OPEN;
let openWidth = aChatbox.hasAttribute("large") ? 300 : CHAT_WIDTH_OPEN;
return aChatbox.minimized ? CHAT_WIDTH_MINIMIZED : openWidth;
]]></body>
</method>

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

@ -848,6 +848,7 @@ let MozLoopServiceInternal = {
}
chatbox.setAttribute("dark", true);
chatbox.setAttribute("large", true);
chatbox.addEventListener("DOMContentLoaded", function loaded(event) {
if (event.target != chatbox.contentDocument) {

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

@ -287,14 +287,14 @@
),
React.createElement(Section, {name: "IncomingCallView"},
React.createElement(Example, {summary: "Default / incoming video call", dashed: "true", style: {width: "260px", height: "254px"}},
React.createElement(Example, {summary: "Default / incoming video call", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(IncomingCallView, {model: mockConversationModel,
video: true})
)
),
React.createElement(Example, {summary: "Default / incoming audio only call", dashed: "true", style: {width: "260px", height: "254px"}},
React.createElement(Example, {summary: "Default / incoming audio only call", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(IncomingCallView, {model: mockConversationModel,
video: false})
@ -303,7 +303,7 @@
),
React.createElement(Section, {name: "IncomingCallView-ActiveState"},
React.createElement(Example, {summary: "Default", dashed: "true", style: {width: "260px", height: "254px"}},
React.createElement(Example, {summary: "Default", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(IncomingCallView, {model: mockConversationModel,
showMenu: true})
@ -314,19 +314,19 @@
React.createElement(Section, {name: "ConversationToolbar"},
React.createElement("h2", null, "Desktop Conversation Window"),
React.createElement("div", {className: "fx-embedded override-position"},
React.createElement(Example, {summary: "Default (260x265)", dashed: "true"},
React.createElement(Example, {summary: "Default", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement(ConversationToolbar, {video: {enabled: true},
audio: {enabled: true},
hangup: noop,
publishStream: noop})
),
React.createElement(Example, {summary: "Video muted"},
React.createElement(Example, {summary: "Video muted", style: {width: "300px", height: "272px"}},
React.createElement(ConversationToolbar, {video: {enabled: false},
audio: {enabled: true},
hangup: noop,
publishStream: noop})
),
React.createElement(Example, {summary: "Audio muted"},
React.createElement(Example, {summary: "Audio muted", style: {width: "300px", height: "272px"}},
React.createElement(ConversationToolbar, {video: {enabled: true},
audio: {enabled: false},
hangup: noop,
@ -383,7 +383,7 @@
React.createElement(Section, {name: "PendingConversationView (Desktop)"},
React.createElement(Example, {summary: "Connecting", dashed: "true",
style: {width: "260px", height: "265px"}},
style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(DesktopPendingConversationView, {callState: "gather",
contact: mockContact,
@ -394,13 +394,13 @@
React.createElement(Section, {name: "CallFailedView"},
React.createElement(Example, {summary: "Call Failed", dashed: "true",
style: {width: "260px", height: "265px"}},
style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(CallFailedView, {dispatcher: dispatcher, store: conversationStore})
)
),
React.createElement(Example, {summary: "Call Failed — with call URL error", dashed: "true",
style: {width: "260px", height: "265px"}},
style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(CallFailedView, {dispatcher: dispatcher, emailLinkError: true,
store: conversationStore})
@ -430,7 +430,7 @@
React.createElement(Section, {name: "ConversationView"},
React.createElement(Example, {summary: "Desktop conversation window", dashed: "true",
style: {width: "260px", height: "265px"}},
style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(ConversationView, {sdk: mockSDK,
model: mockConversationModel,
@ -452,7 +452,7 @@
),
React.createElement(Example, {summary: "Desktop conversation window local audio stream",
dashed: "true", style: {width: "260px", height: "265px"}},
dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement("div", {className: "fx-embedded"},
React.createElement(ConversationView, {sdk: mockSDK,
video: {enabled: false},
@ -503,13 +503,13 @@
React.createElement("strong", null, "Note:"), " For the useable demo, you can access submitted data at ",
React.createElement("a", {href: "https://input.allizom.org/"}, "input.allizom.org"), "."
),
React.createElement(Example, {summary: "Default (useable demo)", dashed: "true", style: {width: "260px"}},
React.createElement(Example, {summary: "Default (useable demo)", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement(FeedbackView, {feedbackStore: feedbackStore})
),
React.createElement(Example, {summary: "Detailed form", dashed: "true", style: {width: "260px"}},
React.createElement(Example, {summary: "Detailed form", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement(FeedbackView, {feedbackStore: feedbackStore, feedbackState: FEEDBACK_STATES.DETAILS})
),
React.createElement(Example, {summary: "Thank you!", dashed: "true", style: {width: "260px"}},
React.createElement(Example, {summary: "Thank you!", dashed: "true", style: {width: "300px", height: "272px"}},
React.createElement(FeedbackView, {feedbackStore: feedbackStore, feedbackState: FEEDBACK_STATES.SENT})
)
),

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

@ -287,14 +287,14 @@
</Section>
<Section name="IncomingCallView">
<Example summary="Default / incoming video call" dashed="true" style={{width: "260px", height: "254px"}}>
<Example summary="Default / incoming video call" dashed="true" style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<IncomingCallView model={mockConversationModel}
video={true} />
</div>
</Example>
<Example summary="Default / incoming audio only call" dashed="true" style={{width: "260px", height: "254px"}}>
<Example summary="Default / incoming audio only call" dashed="true" style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<IncomingCallView model={mockConversationModel}
video={false} />
@ -303,7 +303,7 @@
</Section>
<Section name="IncomingCallView-ActiveState">
<Example summary="Default" dashed="true" style={{width: "260px", height: "254px"}}>
<Example summary="Default" dashed="true" style={{width: "300px", height: "272px"}}>
<div className="fx-embedded" >
<IncomingCallView model={mockConversationModel}
showMenu={true} />
@ -314,19 +314,19 @@
<Section name="ConversationToolbar">
<h2>Desktop Conversation Window</h2>
<div className="fx-embedded override-position">
<Example summary="Default (260x265)" dashed="true">
<Example summary="Default" dashed="true" style={{width: "300px", height: "272px"}}>
<ConversationToolbar video={{enabled: true}}
audio={{enabled: true}}
hangup={noop}
publishStream={noop} />
</Example>
<Example summary="Video muted">
<Example summary="Video muted" style={{width: "300px", height: "272px"}}>
<ConversationToolbar video={{enabled: false}}
audio={{enabled: true}}
hangup={noop}
publishStream={noop} />
</Example>
<Example summary="Audio muted">
<Example summary="Audio muted" style={{width: "300px", height: "272px"}}>
<ConversationToolbar video={{enabled: true}}
audio={{enabled: false}}
hangup={noop}
@ -383,7 +383,7 @@
<Section name="PendingConversationView (Desktop)">
<Example summary="Connecting" dashed="true"
style={{width: "260px", height: "265px"}}>
style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<DesktopPendingConversationView callState={"gather"}
contact={mockContact}
@ -394,13 +394,13 @@
<Section name="CallFailedView">
<Example summary="Call Failed" dashed="true"
style={{width: "260px", height: "265px"}}>
style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<CallFailedView dispatcher={dispatcher} store={conversationStore} />
</div>
</Example>
<Example summary="Call Failed — with call URL error" dashed="true"
style={{width: "260px", height: "265px"}}>
style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<CallFailedView dispatcher={dispatcher} emailLinkError={true}
store={conversationStore} />
@ -430,7 +430,7 @@
<Section name="ConversationView">
<Example summary="Desktop conversation window" dashed="true"
style={{width: "260px", height: "265px"}}>
style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<ConversationView sdk={mockSDK}
model={mockConversationModel}
@ -452,7 +452,7 @@
</Example>
<Example summary="Desktop conversation window local audio stream"
dashed="true" style={{width: "260px", height: "265px"}}>
dashed="true" style={{width: "300px", height: "272px"}}>
<div className="fx-embedded">
<ConversationView sdk={mockSDK}
video={{enabled: false}}
@ -503,13 +503,13 @@
<strong>Note:</strong> For the useable demo, you can access submitted data at&nbsp;
<a href="https://input.allizom.org/">input.allizom.org</a>.
</p>
<Example summary="Default (useable demo)" dashed="true" style={{width: "260px"}}>
<Example summary="Default (useable demo)" dashed="true" style={{width: "300px", height: "272px"}}>
<FeedbackView feedbackStore={feedbackStore} />
</Example>
<Example summary="Detailed form" dashed="true" style={{width: "260px"}}>
<Example summary="Detailed form" dashed="true" style={{width: "300px", height: "272px"}}>
<FeedbackView feedbackStore={feedbackStore} feedbackState={FEEDBACK_STATES.DETAILS} />
</Example>
<Example summary="Thank you!" dashed="true" style={{width: "260px"}}>
<Example summary="Thank you!" dashed="true" style={{width: "300px", height: "272px"}}>
<FeedbackView feedbackStore={feedbackStore} feedbackState={FEEDBACK_STATES.SENT} />
</Example>
</Section>