octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-12 16:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2738 from tpng/patch-1

Browse Source 
Handle null case for invalid ng-model value (fixes #2392)
This commit is contained in:
Audrius Butkevicius 2016-01-30 03:25:31 +00:00
commit 1a0a8a1655
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -13,6 +13,7 @@ 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>
Ben Sidhom <bsidhom@gmail.com> Ben Sidhom <bsidhom@gmail.com>
Benny Ng <benny.tpng@gmail.com>
Brandon Philips <brandon@ifup.org> Brandon Philips <brandon@ifup.org>
Brendan Long <self@brendanlong.com> Brendan Long <self@brendanlong.com>
Brian R. Becker <brbecker@gmail.com> Brian R. Becker <brbecker@gmail.com>

1
NICKS
View File

@ -72,6 +72,7 @@ Stefan-Code <stefan.github@gmail.com> <Stefan.github@gmail.com>
timabell <tim@timwise.co.uk> timabell <tim@timwise.co.uk>
tnn2 <tnn@nygren.pp.se> tnn2 <tnn@nygren.pp.se>
tojrobinson <tully@tojr.org> tojrobinson <tully@tojr.org>
tpng <benny.tpng@gmail.com>
tylerbrazier <tyler@tylerbrazier.com> tylerbrazier <tyler@tylerbrazier.com>
uok <ueomkail@gmail.com> <uok@users.noreply.github.com> uok <ueomkail@gmail.com> <uok@users.noreply.github.com>
veeti <veeti.paananen@rojekti.fi> veeti <veeti.paananen@rojekti.fi>

3
gui/default/syncthing/core/syncthingController.js
View File

@ -1531,6 +1531,9 @@ angular.module('syncthing.core')
if (key.substr(0, 1) === '_') { if (key.substr(0, 1) === '_') {
return 'skip'; return 'skip';
} }
if (value === null) {
return 'null';
}
if (typeof value === 'number') { if (typeof value === 'number') {
return 'number'; return 'number';
} }