Skip to content

Provide feedback to the user when some operations are in progress #2117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 7 commits into from
Aug 28, 2019
Merged

Provide feedback to the user when some operations are in progress #2117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c37737
Use "prop()" instead of "attr()" to get properties
danxuliu Aug 20, 2019
f56122a
Wait for the server response to set the room as public or private
danxuliu Aug 20, 2019
5d6ed51
Provide feedback while waiting for the server to set the password
danxuliu Aug 21, 2019
bb1ad01
Do not mark the password field as required
danxuliu Aug 21, 2019
4af0898
Fix markup
danxuliu Aug 21, 2019
7948939
Simplify CSS rules for confirm icon in editable text label
danxuliu Aug 21, 2019
584b30d
Wait for the server response to rename the room
danxuliu Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix markup 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Aug 27, 2019
commit 4af089839787a77f5e295e878ed3a3e2459e744c
2 changes: 1 addition & 1 deletion js/views/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ templates['editabletextlabel'] = template({"1":function(container,depth0,helpers
+ container.escapeExpression(((helper = (helper = helpers.inputValue || (depth0 != null ? depth0.inputValue : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"inputValue","hash":{},"data":data}) : helper)))
+ "\" "
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.inputPlaceholder : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ">\n <input type=\"submit\" value=\"\" class=\"icon icon-confirm confirm-button\"></div>\n</div>\n";
+ ">\n <input type=\"submit\" value=\"\" class=\"icon icon-confirm confirm-button\">\n</div>\n";
},"5":function(container,depth0,helpers,partials,data) {
var helper;

Expand Down
2 changes: 1 addition & 1 deletion js/views/templates/editabletextlabel.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{{#if editionEnabled}}
<div class="input-wrapper hidden-important">
<input class="username" {{#if inputMaxLength}} maxlength="{{inputMaxLength}}" {{/if}} type="text" value="{{inputValue}}" {{#if inputPlaceholder}} placeholder="{{inputPlaceholder}}" {{/if}}>
<input type="submit" value="" class="icon icon-confirm confirm-button"></div>
<input type="submit" value="" class="icon icon-confirm confirm-button">
</div>
{{/if}}