Merge pull request #2018 from brgmnn/master

Added select ID text on click to gui
This commit is contained in:
Jakob Borg 2015-07-02 11:01:37 +02:00
commit 76822c7c34
5 changed files with 27 additions and 8 deletions

View File

@ -3,8 +3,8 @@
Aaron Bieber <qbit@deftly.net> Aaron Bieber <qbit@deftly.net>
Alexander Graf <register-github@alex-graf.de> Alexander Graf <register-github@alex-graf.de>
Andrew Dunham <andrew@du.nham.ca> Andrew Dunham <andrew@du.nham.ca>
Audrius Butkevicius <audrius.butkevicius@gmail.com>
Arthur Axel fREW Schmidt <frew@afoolishmanifesto.com> <frioux@gmail.com> Arthur Axel fREW Schmidt <frew@afoolishmanifesto.com> <frioux@gmail.com>
Audrius Butkevicius <audrius.butkevicius@gmail.com>
Bart De Vries <devriesb@gmail.com> Bart De Vries <devriesb@gmail.com>
Ben Curthoys <ben@bencurthoys.com> Ben Curthoys <ben@bencurthoys.com>
Ben Schulz <ueomkail@gmail.com> <uok@users.noreply.github.com> Ben Schulz <ueomkail@gmail.com> <uok@users.noreply.github.com>
@ -17,6 +17,7 @@ Cathryne Linenweaver <cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.gi
Chris Howie <me@chrishowie.com> Chris Howie <me@chrishowie.com>
Chris Joel <chris@scriptolo.gy> Chris Joel <chris@scriptolo.gy>
Colin Kennedy <moshen.colin@gmail.com> Colin Kennedy <moshen.colin@gmail.com>
Daniel Bergmann <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
Daniel Martí <mvdan@mvdan.cc> Daniel Martí <mvdan@mvdan.cc>
Dennis Wilson <dw@risu.io> Dennis Wilson <dw@risu.io>
Dominik Heidler <dominik@heidler.eu> Dominik Heidler <dominik@heidler.eu>
@ -39,9 +40,9 @@ Karol Różycki <rozycki.karol@gmail.com>
Ken'ichi Kamada <kamada@nanohz.org> Ken'ichi Kamada <kamada@nanohz.org>
Lode Hoste <zillode@zillode.be> Lode Hoste <zillode@zillode.be>
Lord Landon Agahnim <lordlandon@gmail.com> Lord Landon Agahnim <lordlandon@gmail.com>
Marcin Dziadus <dziadus.marcin@gmail.com>
Marc Laporte <marc@marclaporte.com> <marc@laporte.name> Marc Laporte <marc@marclaporte.com> <marc@laporte.name>
Marc Pujol <kilburn@la3.org> Marc Pujol <kilburn@la3.org>
Marcin Dziadus <dziadus.marcin@gmail.com>
Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com> Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
Michael Tilli <pyfisch@gmail.com> Michael Tilli <pyfisch@gmail.com>
Pascal Jungblut <github@pascalj.com> <mail@pascal-jungblut.com> Pascal Jungblut <github@pascalj.com> <mail@pascal-jungblut.com>

5
NICKS
View File

@ -15,6 +15,7 @@ asdil12 <dominik@heidler.eu>
bencurthoys <ben@bencurthoys.com> bencurthoys <ben@bencurthoys.com>
bigbear2nd <bigbear2nd@gmail.com> bigbear2nd <bigbear2nd@gmail.com>
brendanlong <self@brendanlong.com> brendanlong <self@brendanlong.com>
brgmnn <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
bsidhom <bsidhom@gmail.com> bsidhom <bsidhom@gmail.com>
calmh <jakob@nym.se> calmh <jakob@nym.se>
cdata <chris@scriptolo.gy> cdata <chris@scriptolo.gy>
@ -36,8 +37,8 @@ kozec <kozec@kozec.com>
krozycki <rozycki.karol@gmail.com> krozycki <rozycki.karol@gmail.com>
marcindziadus <dziadus.marcin@gmail.com> marcindziadus <dziadus.marcin@gmail.com>
marclaporte <marc@marclaporte.com> marclaporte <marc@marclaporte.com>
moshen <moshen.colin@gmail.com>
mogwa1 <devriesb@gmail.com> mogwa1 <devriesb@gmail.com>
moshen <moshen.colin@gmail.com>
mvdan <mvdan@mvdan.cc> mvdan <mvdan@mvdan.cc>
pascalj <github@pascalj.com> <mail@pascal-jungblut.com> pascalj <github@pascalj.com> <mail@pascal-jungblut.com>
peterhoeg <peter@speartail.com> peterhoeg <peter@speartail.com>
@ -45,9 +46,9 @@ philips <brandon@ifup.org>
piobpl <piotrb10@gmail.com> piobpl <piotrb10@gmail.com>
pluby <phill.luby@newredo.com> pluby <phill.luby@newredo.com>
pyfisch <pyfisch@gmail.com> pyfisch <pyfisch@gmail.com>
qbit <qbit@deftly.net>
ralder <ralder@yandex.ru> ralder <ralder@yandex.ru>
rumpelsepp <stefan@sevenbyte.org> rumpelsepp <stefan@sevenbyte.org>
qbit <qbit@deftly.net>
sciurius <jvromans@squirrel.nl> sciurius <jvromans@squirrel.nl>
seehuhn <voss@seehuhn.de> seehuhn <voss@seehuhn.de>
snnd <dw@risu.io> snnd <dw@risu.io>

View File

@ -507,7 +507,7 @@
<!-- ID modal --> <!-- ID modal -->
<modal id="idqr" large="yes" status="info" close="yes" icon="qrcode" title="{{'Device Identification' | translate}} &mdash; {{deviceName(thisDevice())}}"> <modal id="idqr" large="yes" status="info" close="yes" icon="qrcode" title="{{'Device Identification' | translate}} &mdash; {{deviceName(thisDevice())}}">
<div class="well well-sm text-monospace text-center">{{myID}}</div> <div select-on-click class="well well-sm text-monospace text-center">{{myID}}</div>
<img ng-if="myID" class="center-block img-thumbnail" ng-src="qr/?text={{myID}}"/> <img ng-if="myID" class="center-block img-thumbnail" ng-src="qr/?text={{myID}}"/>
</modal> </modal>
@ -1088,6 +1088,7 @@
<li class="auto-generated">Chris Howie</li> <li class="auto-generated">Chris Howie</li>
<li class="auto-generated">Chris Joel</li> <li class="auto-generated">Chris Joel</li>
<li class="auto-generated">Colin Kennedy</li> <li class="auto-generated">Colin Kennedy</li>
<li class="auto-generated">Daniel Bergmann</li>
<li class="auto-generated">Daniel Martí</li> <li class="auto-generated">Daniel Martí</li>
<li class="auto-generated">Dennis Wilson</li> <li class="auto-generated">Dennis Wilson</li>
<li class="auto-generated">Dominik Heidler</li> <li class="auto-generated">Dominik Heidler</li>
@ -1167,6 +1168,7 @@
<script src="scripts/syncthing/core/directives/uniqueFolderDirective.js"></script> <script src="scripts/syncthing/core/directives/uniqueFolderDirective.js"></script>
<script src="scripts/syncthing/core/directives/validDeviceidDirective.js"></script> <script src="scripts/syncthing/core/directives/validDeviceidDirective.js"></script>
<script src="scripts/syncthing/core/directives/popoverDirective.js"></script> <script src="scripts/syncthing/core/directives/popoverDirective.js"></script>
<script src="scripts/syncthing/core/directives/selectOnClickDirective.js"></script>
<script src="scripts/syncthing/core/filters/alwaysNumberFilter.js"></script> <script src="scripts/syncthing/core/filters/alwaysNumberFilter.js"></script>
<script src="scripts/syncthing/core/filters/basenameFilter.js"></script> <script src="scripts/syncthing/core/filters/basenameFilter.js"></script>
<script src="scripts/syncthing/core/filters/binaryFilter.js"></script> <script src="scripts/syncthing/core/filters/binaryFilter.js"></script>

View File

@ -0,0 +1,14 @@
angular.module('syncthing.core')
.directive('selectOnClick', function ($window) {
return {
link: function (scope, element, attrs) {
element.on('click', function() {
var selection = $window.getSelection();
var range = document.createRange();
range.selectNodeContents(element[0]);
selection.removeAllRanges();
selection.addRange(range);
});
}
};
});

File diff suppressed because one or more lines are too long