Merge pull request #6310 from nbianca/ux_ip_lookup

UX: Improve copying from IP lookup component.
This commit is contained in:
Guo Xiang Tan 2018-08-27 13:04:35 +08:00 committed by GitHub
commit 53a6c31107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions

View File

@ -88,10 +88,13 @@ export default Ember.Component.extend({
text += `: ${location.phone}\n`;
}
}
const copyRange = $(`<textarea id="copy-range"></textarea>`);
copyRange.text(text);
const copyRange = $('<p id="copy-range"></p>');
copyRange.html(text.trim().replace("\n", "<br>"));
$(document.body).append(copyRange);
copyText(text, copyRange[0]);
if (copyText(text, copyRange[0])) {
this.set("copied", true);
Ember.run.later(() => this.set("copied", false), 2000);
}
copyRange.remove();
},

View File

@ -6,7 +6,11 @@
{{#if show}}
<div class="location-box">
<a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
<a class="btn pull-right" {{action "copy"}}>{{d-icon "copy"}}</a>
{{#if copied}}
<a class="btn btn-hover pull-right">{{d-icon "copy"}} {{i18n "ip_lookup.copied"}}</a>
{{else}}
<a class="btn pull-right" {{action "copy"}}>{{d-icon "copy"}}</a>
{{/if}}
<h4>{{i18n 'ip_lookup.title'}}</h4>
<p class='powered-by'>{{{i18n 'ip_lookup.powered_by'}}}</p>
<dl>

View File

@ -597,6 +597,7 @@ en:
post_count: "# posts"
confirm_delete_other_accounts: "Are you sure you want to delete these accounts?"
powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
copied: "copied"
user_fields:
none: "(select an option)"