From 5c65e10875209a3f50c10f7bec1e0253cfaf9ca4 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 18 May 2014 22:40:25 +0200 Subject: [PATCH] Also remove dashes from GUI entered node IDs --- auto/gui.files.go | 2 +- gui/app.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/auto/gui.files.go b/auto/gui.files.go index be04a67b7..b544bcf98 100644 --- a/auto/gui.files.go +++ b/auto/gui.files.go @@ -18,7 +18,7 @@ func init() { bs, _ = ioutil.ReadAll(gr) Assets["angular.min.js"] = bs - bs, _ = hex.DecodeString("1f8b080000096e8800ffd41c5d6fdbb6f63dbf82f3ba496e1d3b19ee868bbae9b0a5dd90dbf503cdda97200fb245c76a644aa3a82646e6ff7ecf21299914295949daae33b0c5260fcf37cf074575f2f04391264c9019cfae0aca1f13c14b3a22f38c898495b4fa9da76581ffa9dfe4e1646ff2f022cd66514a1e3c268b282d00286217651a71fd1b81f68212be14822773114cf7f63e469c146b3617cb845d90a36ac57895c5654ac3a09e0b46e4ec7c38950b4a9ece22407344024e0bc483a39c2ee0d7f28409ca3f021b47e4f0003e5332999055b1b757a31aa32c3c4b53cac3e0b41a3d163c05228b127e271923e183629ee520c483a510f990dcec11f820a19cd38fcf2281f40fa6f528721271a1c490f2827838a9f08c2fa878fd02a6505d537302b86154d22c60fa66d39c5c2417eef86a7df20ce50fac5196c514919c9d7b909c3094d5c701e53ce39e7505a5ec39ceb994c03e3475d9e234cf3c52a45121dee531e82c864946af08ea2f1c5a404b0aea9bd14828bdca2930dd29f80abb28c88c2e324ec92ccbd282a459760923024c6d332c84040651e4f84d123f26c11f4921280344605f50d01c1c52da9dbce199c8e6594a1404f9258ec18c052d0050ac7370f640d06b01bfb47595b76f4606f297d1f52965f18b595e18e85f97e222435f788b8ef247b24a04095ffc9a17c32d6a56ae669477227f0be82256b9f4a94140cd90dadbc35b63d67ee747ae27ef8eff4dc423d861e95bfa570940a66e406304f4032b592c55b405e98f1f901c2f215ad086e211f96f494a899a55faefad7983c0ef3298fdc2d87316cd521a1b34d41481b90ca205dde245e7ece4fa8f6cde8253cedc05e5298effaa82b5e9df384cb6e3263a6bfdbb37ec8dcb8e1a2138e95f7cde886e6572eadf7c7a4f99ea7b77729f0df7ce1614b1fd528a2585fc348f64e87e6789bc13e19ba828ae321e772335a034e27c3be2435e69a8ce2890014ecbf99cd298c66195507a4749fc240b127e63e613138b8129618930d7c9a930f89651010c5fca981e0c31884769182c9398064de8b6a4859f8dc5d036f1dd929bedc26e5e7c99d56665e36afab7088280ade66e66391525676d42762abd4db337b3687e19f32c076701b2e04ae02a97743dcb221eeba268d3adf886b80644235d762ba40676146209e635df8328cfd375b82d8c9af2b730153a638fc8e1907c477eb4e5313560715fd714b2ae4365785990f5190a105675e123124c8a3504981598a2c02d571406ffb0c3a2a60cf6def42a5c61043670bdc1f250d54f1d0a32dcd15cb7fdfe7af60192ed185ca308cd4a6a38869ae779345f1ac893d8f13faf026485f633a2390a6080b2390cbc7b7b729cadf28c4160434c7dd563a841e23d4be27347138e318def7e1e8dd2b7b7a5b0d666d91550c7e80825ef55381c591002c3678830fb75ad3e2413d90ed89049ac6374f5314a7b58ef75838441c161ef3963362b453d6dcd8321d1762461a44dc132bae3e4781915afaf1854a739e5622d0de581c74fd5964d9dd98d3322f8ba050b124593d6c2bd8cc472bc8aaec38311f92f79a82c21214ed8af6b418b3f3301e5cabea78771a050f5221eba1c5a946bc5b593869ab10f6d0bac95f886405e9f2f4948db54eb28e5a0af081e40d71a963b3d3a6a907331d80e662e50438d7de8734ebbd36c86b15d9b557589bdf769b3b7f493db4cf79afd2354aea22cac708fc3cdc4854558b6b0a312c2415c3a8276b564315d240c8a5a7fa2873a925dc21e6781997d7ca9d1400db6815e0876f13748a215f3a9c8f21c287b31cb130fa1624c8091d94346ce6f5757e0f2efd9c1f95864ef80003f06d340b279a426c02eb342f0f07038b5e5d0cb8fc8009b5e287d06e4efbfc976f4244ee9a0298b9a06371b9070b0e5120f51de503e87fc115d506d984764f0dd70e09556abc410a899dcf3ec180adf2f606fec03f613b6c83e83c525ee181b4efec9ac6e992e48c048dde4f5b60cda4ad82dae42b94137ba9c27ab88afbde8da546adbd6f695cf6e6048ef3baa7753d9eaac52260a89ffa01f56cba0f95ca8534648535ed7c1fda6484c7c00060fd3a66e651a9cd3240d818a3f58e2699f2758e2f0f1c2ea6f90590cfe00e7499a7ac1f815fc3d79766e7b20023655538d8fb1964ca9248b3a044df89269e52d278ca0428246a62214cf86db97e9a04542dc364db29098be1b36317604a2e0595268d9eb00ed51ebc91c45fa372835bbbcad3e753f751ba5ada0c42cdab5e506f0af565d6e90eca5333718eed49919165d95e1c1d717d698664c2a4d9fbb75c5f69f3bec6da8fc1f13a111043af354bb28efe94e33203336a7d2d18c07312d6c6a888f941780dbc7dfe7544f9a40de7ddf4ebb879d5f452b7a2bed007c0b4f26480737b6c855450b9de04ffe14289649f1cac769d309ab27638d75cdc3555d836868bbecc0a2594e8c53ca2ec4124a423ccff28a3b084bd55dc815766ddc640be495c70d80196afbe957a2591a27c238d16f397a0b836fab676e7d4f3de509f9d05b2f461fe96e92de479a8d63520b68fc3a97fb69ac9e39e8d0676d3917ea54f07191a7890883114a16e546bb7b0d0c557abd1e0bc80de0479e0e3acf0ae7bc0b48813afe77fafad5b8904f3693c53ab438198ec8cd9246316cddc7e42638ce18f023f6ff04d70c40a5781aab9f494c3e14190b3616619f450678aa3e68ebb8e58178abbeadc377fb3140db197eb1ccae82ddcad04b2dc81dcfab3d3e8afebc2b4655684bce41937ac58331342f94c5e1cd6654ed0e97152401c23dbf06aff0eac0023ba5e9429d3d36d285952d5c79b78c8deb2762e0813a2c20a67a78fc214b183825f1e80d819f0327191f3f002778c325d35690439b556abbd38eb52d10c5b163809d9abf31650492f19a452ba0b9e9a17dff46b7d5ef87f9f2ca81468f0adaad1f1f45e72198f9d8afa192dd4fb17c7a30a29fca688b2415d47c84d1565bb0caa7bfd93ab5e9be6ab6e558d18ab7af3c7c180757f2bc1c53a43a33578f43fc478c724e9e84367036267a48790f499bd2ba9adf91b3fe8994d1f058ccc09dfe6ad42c2312678c8e4832bdada0bd7c7e5b19b9ba77a0ea40db2c73c003d2684ec3099900c30190d3d9dac150c7245fd0bd63355013414db98a508f84e4f302929027f68e5435264c3c7ae46b7d4dd8b3e4dc6c4c6c15743cc9ab166f259e3aa09a733be9559f19a7d1658f96583dd8024c2d1b58499c97c5327413714b041b17191761d58d469cde35d07c0dfb2e134bca2b3edbea30b3a76c8ddabd833656226e986e69af3ae34102e5533370dfc1ab59c344e09853c7ed59cf0edc10fe8c9db7bba84766f9c00a9b809ea6500fb85c5bb4f56b74fc6702cdea53e792e54e6bcc531af1e7d5f3b4ce82cbbcb969f1796673ad3bd97d72782ed9da998ee4ba89e424f073b9e00954d5e9da7567d84426abdb0c7f7b679107276676f0bb4c216b68f87f9d08e675601c354f3a706ee8dc45312c07785a5aa83cebe330159c7dc5c3d709637a7c0bb3b76b6cf48a6d635340018ae7dcd21410a0365d9d8e81a42a979cbb274ebde4596b113dab36ecb97b89eccecd16eaad67258f1c7d9a36c731c74e3b78d47fe706e7cb8b8ca560a7cceace7b9e7d8a52d0e2d929053515a714c4550e549deecfcedd39db378dfce1ba671d9d984a38ba0771b0f88a333f39566d842345cb9fb30c21544574a336d063cd48f3be60339be147359e7e7e5d13a92ea90256bad0bfda4a2ad47c81de984855b705b6afaac6524ae9dec6bddcf1d374e3da46960d3cd1d43af7bfa711fe2d5d28de17366cd4e3b2a77ec472dbbb497a99f772d20e8ab7bc5e5adf88f05e213520f47b3df216a05ba2ef604a5be9964cd5af18b532d57642bee30c5db7cfd689656bfbe7e0d2d1aa0dded7ffb51e0ee9edf112faf6f63dd48a403e2e6f5edded658a095e81b99b3dea0d2a5dc11cdbd92754f7ede518540bd53b3ca12dd1a8f9c69cc666aea8ef6e8fc84f3f1e008014bd16c3507f188dc8ac92c8789416c90753eafa94f12cedfbef89069879019a8f18359a271a7ce8ebacf60fa7cd925b2f7baa9755b5b68155657789d7392f69e055ebb698d5d2a7f552d08ea11b99425b74138d9f251c7272c6d79274fdab3ff52d82a72602970774fad47c7d7165bc9f977a8a7cab495b9df1aa24d06c682fd18cac5c823209ad4c8aa9518e35ce755726b154553c2b3cb21d1a42a76ab31b1ab599486d26623a4f5690d6804c0a0d4f69f11227178928f04d9f79550ba145e40ba3cd6b601afd81d5a22904d545e5459a653c945fd3ec427d896692f410ef1ed7338707556f89941bf79c8147e8c115665b34c5e6c67c7b559f34042c0288c87e67b5e25eaf36de1a6079099b58de65f48828a7c722fb2db9a671582bd05ab50d363208b80ccd12867764faf3d3dce472509aa10e046d57140f48eb3d4785e529393cf8e13fe4a1f9c7a9d525e4e4c8033af551edd6d20f43bc091b90df93dbb0d687a77b30f3b21f339d5cdc83fc0b3f79f38e23cfc0d8953fe09a60979fad28be3efe15f999bc006afce9d06613f43e7e761bcefab0741f37ebc54b2713f7a07ef9199cac5842cab9a38f59cc7b6fdab4108dd2ab685dbcaade4efefcfeedbd316db2bf8be3f9b2649727cf3e31b33e5607c6252a79f91a2a53cca34acb2b7c99279c8c6f0e473f6d2617cd765d02ef44ab8724b0ee5af6eb53eea606625972251f691864b2ed51e7735d9a303d44fd1318d0161f072363589e52eb7f63a31e163c62c53c2d63674616f48f9baf6ea8fb3f80fb487f35486c0cb47405e404becafc4459014bf2a301deea1f1076b12fefaa1f0dece6ee4ce31c43913678fa6422573ed5145c4731d454b2e4af529ec0184aead2d15f252cc6d7f52f5e2227861469c22e1f6f7148358c084d57231209c1a1be9b0b9e369d1ec7c60fc0bc0534fee39215cb6421eaca37fc98d0abf751ea3f99936f50f439f3a93e9309b9a204c24899c62c10aa88026d7b811567a0d9f708958875435bf2bc70ea2cd5f796b7bca973a45a90f30ee6c4529d10128a8214244a398de2f59dd8938748edfcede621298842f849b5e38c681fabf5d3384a755f4456eefc7f000000ffff010000ffff0689b81c14470000") + bs, _ = hex.DecodeString("1f8b080000096e8800ffd41c5d6fdbb6f63dbf82f3ba496e1d3b19ee868bbae9b0a5dd90dbf503cdda97200fb245c76a644aa3a82646e6ff7ecf21299914295949daae33b0c5260fcf37cf074575f2f04391264c9019cfae0aca1f13c14b3a22f38c898495b4fa9da76581ffa9dfe4e1646ff2f022cd66514a1e3c268b282d00286217651a71fd1b81f68212be14822773114cf7f63e469c146b3617cb845d90a36ac57895c5654ac3a09e0b46e4ec7c38950b4a9ece22407344024e0bc483a39c2ee0d7f28409ca3f021b47e4f0003e5332999055b1b757a31aa32c3c4b53cac3e0b41a3d163c05228b127e271923e183629ee520c483a510f990dcec11f820a19cd38fcf2281f40fa6f528721271a1c490f2827838a9f08c2fa878fd02a6505d537302b86154d22c60fa66d39c5c2417eef86a7df20ce50fac5196c514919c9d7b909c3094d5c701e53ce39e7505a5ec39ceb994c03e3475d9e234cf3c52a45121dee531e82c864946af08ea2f1c5a404b0aea9bd14828bdca2930dd29f80abb28c88c2e324ec92ccbd282a459760923024c6d332c84040651e4f84d123f26c11f4921280344605f50d01c1c52da9dbce199c8e6594a1404f9258ec18c052d0050ac7370f640d06b01bfb47595b76f4606f297d1f52965f18b595e18e85f97e222435f788b8ef247b24a04095ffc9a17c32d6a56ae669477227f0be82256b9f4a94140cd90dadbc35b63d67ee747ae27ef8eff4dc423d861e95bfa570940a66e406304f4032b592c55b405e98f1f901c2f215ad086e211f96f494a899a55faefad7983c0ef3298fdc2d87316cd521a1b34d41481b90ca205dde245e7ece4fa8f6cde8253cedc05e5298effaa82b5e9df384cb6e3263a6bfdbb37ec8dcb8e1a2138e95f7cde886e6572eadf7c7a4f99ea7b77729f0df7ce1614b1fd528a2585fc348f64e87e6789bc13e19ba828ae321e772335a034e27c3be2435e69a8ce2890014ecbf99cd298c66195507a4749fc240b127e63e613138b8129618930d7c9a930f89651010c5fca981e0c31884769182c9398064de8b6a4859f8dc5d036f1dd929bedc26e5e7c99d56665e36afab7088280ade66e66391525676d42762abd4db337b3687e19f32c076701b2e04ae02a97743dcb221eeba268d3adf886b80644235d762ba40676146209e635df8328cfd375b82d8c9af2b730153a638fc8e1907c477eb4e5313560715fd714b2ae4365785990f5190a105675e123124c8a3504981598a2c02d571406ffb0c3a2a60cf6def42a5c61043670bdc1f250d54f1d0a32dcd15cb7fdfe7af60192ed185ca308cd4a6a38869ae779345f1ac893d8f13faf026485f633a2390a6080b2390cbc7b7b729cadf28c4160434c7dd563a841e23d4be27347138e318def7e1e8dd2b7b7a5b0d666d91550c7e80825ef55381c591002c3678830fb75ad3e2413d90ed89049ac6374f5314a7b58ef75838441c161ef3963362b453d6dcd8321d1762461a44dc132bae3e4781915afaf1854a739e5622d0de581c74fd5964d9dd98d3322f8ba050b124593d6c2bd8cc472bc8aaec38311f92f79a82c21214ed8af6b418b3f3301e5cabea78771a050f5221eba1c5a946bc5b593869ab10f6d0bac95f886405e9f2f4948db54eb28e5a0af081e40d71a963b3d3a6a907331d80e662e50438d7de8734ebbd36c86b15d9b557589bdf769b3b7f493db4cf79afd2354aea22cac708fc3cdc4854558b6b0a312c2415c3a8276b564315d240c8a5a7fa2873a925dc21e6781997d7ca9d1400db6815e0876f13748a215f3a9c8f21c287b31cb130fa1624c8091d94346ce6f5757e0f2efd9c1f95864ef80003f06d340b279a426c02eb342f0f07038b5e5d0cb8fc8009b5e287d06e4efbfc976f4244ee9a0298b9a06371b9070b0e5120f51de503e87fc115d506d984764f0dd70e09556abc410a899dcf3ec180adf2f606fec03f613b6c83e83c525ee181b4efec9ac6e992e48c048dde4f5b60cda4ad82dae42b94137ba9c27ab88afbde8da546adbd6f695cf6e6048ef3baa7753d9eaac52260a89ffa01f56cba0f95ca8534648535ed7c1fda6484c7c00060fd3a66e651a9cd3240d818a3f58e2699f2758e2f0f1c2ea6f90590cfe00e7499a7ac1f815fc3d79766e7b20023655538d8fb1964ca9248b3a044df89269e52d278ca0428246a62214cf86db97e9a04542dc364db29098be1b36317604a2e0595268d9eb00ed51ebc91c45fa372835bbbcad3e753f751ba5ada0c42cdab5e506f0af565d6e90eca5333718eed49919165d95e1c1d717d698664c2a4d9fbb75c5f69f3bec6da8fc1f13a111043af354bb28efe94e33203336a7d2d18c07312d6c6a888f941780dbc7dfe7544f9a40de7ddf4ebb879d5f452b7a2bed007c0b4f26480737b6c855450b9de04ffe14289649f1cac769d309ab27638d75cdc3555d836868bbecc0a2594e8c53ca2ec4124a423ccff28a3b084bd55dc815766ddc640be495c70d80196afbe957a2591a27c238d16f397a0b836fab676e7d4f3de509f9d05b2f461fe96e92de479a8d63520b68fc3a97fb69ac9e39e8d0676d3917ea54f07191a7890883114a16e546bb7b0d0c557abd1e0bc80de0479e0e3acf0ae7bc0b48813afe77fafad5b8904f3693c53ab438198ec8cd9246316cddc7e42638ce18f023f6ff04d70c40a5781aab9f494c3e14190b3616619f450678aa3e68ebb8e58178abbeadc377fb3140db197eb1ccae82ddcad04b2dc81dcfab3d3e8afebc2b4655684bce41937ac58331342f94c5e1cd6654ed0e97152401c23dbf06aff0eac0023ba5e9429d3d36d285952d5c79b78c8deb2762e0813a2c20a67a78fc214b183825f1e80d819f0327191f3f002778c325d35690439b556abbd38eb52d10c5b163809d9abf31650492f19a452ba0b9e9a17dff46b7d5ef87f9f2ca81468f0adaad1f1f45e72198f9d8afa192dd4fb17c7a30a29fca688b2415d47c84d1565bb0caa7bfd93ab5e9be6ab6e558d18ab7af3c7c180757f2bc1c53a43a33578f43fc478c724e9e84367036267a48790f499bd2ba9adf91b3fe8994d1f058ccc09dfe6ad42c2312678c8e4832bdada0bd7c7e5b19b9ba77a0ea40db2c73c003d2684ec3099900c30190ab47f6ab119dbf1d9c7594f285e13bd6073511d49dab1af590483e4120097962ef515575c2c4a347be66d8843d4bcecd56c5564ac7b3bd6af156e2a903aa39b7d360f599711a5df66892d5a32ec0d4b2a595c479592c433735b7c4b47191711156fd69c4e95d43cfd7b01333b1a4bce2b3ad3233bbccd638de3b8c636de206ee9686ab33422450503543f91dbc9a354c048e3975dc9ef5ecc90de1cfd879bb8b7a64968fb0b02de8690af5c8cbb5455b0747c77f26d0be3e75ae5deeb4c63ca5117f5e3d61eb2cc1ccbb9c169f6736d7bab7dd2787e792ad9d094aae9b484e023f970b9e409d9dae5d77864d64b2bacdf9b77716799462e60bbfcb14b2aa86ffd789605e07c651f3ec03e786ceed14c37280a7a5a9cab33e0e53c1d9973e7cbd3126ccb7307bbb5647afd8b63a0594a478f22d4d01016ad3d5fb1848aa02cab98de254509eb516d1b36ac39ebbd7caeedc7ea1de7ad6f6c8d1a7697c1c73ecb48347fd776e79bebcc8581c76caac6ec1e7d9a7280e2d9e9de25053718a435ce540d5e9feecdc9db37dd3c81fae7bd6d189a984a3bb12078baf38f39363d5463852b4fc39cb10425544376a033dd68c346f1036b3197e542beae7d73591ea9b2a60a50bfdabada442cd17e88d8954755b60fbaa6a2ca594ee6ddccb1d3f4d7fae6d64d9c0134dad2701f734c2bfa52fc51bc4868d7a5cffd40f5d6e7b5b492ff35e57da41f196174eeb3b12de4ba506847ed347de0b744bf41d4c692bdd92a9faa5a356a6dacecc779caaebf6d93ac36c6dff1c5c3a5ab5c1fbfabfd6e322bd3d5e42dfdebe875a11c807e8cdcbbcbd4c31c14b3177b347bd41a52b98633bfb84ea06be1c836aa17aab27b4251a35dfa1d3d8cc15f56dee11f9e9c7030090a2d76218ea0fa311995512190fd722f9a84a5da8329eae7dff3dd100332f40f3a1a346f344830f7d9dd5fee1b45972eb654ff5b2aad636b0aaec2ef13ae7250dbc6add16b35afab45e0ada31742353688b6ea2f1b384434ecef85a92ae7ff5a7be45f0d444e0f2804e9f9a2f34ae8c37f6524f916f3569ab335e95049a0ded259a91954b5026a195493135cab1c649efca2496aa8a678587b84343e8546d7643a33613a9cd444ce7c90ad21a9049a1e1292d5ee2e4221105befb33af6a21b4887c85b479314ca33fb05a3485a0bababc48b38c87f26b9a5da82fd14c921ee26de47ae6f0a0ea2d9172e3e633f0083db8c26c8ba6d8dc98efb3ea938680450011d96fb156dcebd5c67b042c2f6113cbdb8d1e11e5f45864bf25d7340e6b055aabb6c146060197a159c2f0d64c7f7e9a9b5c0e4a33d481a0edd2e20169bdf9a8b03c2587073ffc873c34ff38b5ba849c1c7940a73eaadd5afa6188776303f27b721bd6faf0740f665ef663a6938b7b907fe1276fde7ae41918bbf2075c13ecf2b315c517cabf223f9357428d3f1dda6c82dec7cf6ec3591f96eee366bd78e964e21ed42f3f8393154b483977f4318b79efdd9b16a2517a15ad8b57d5fbca9fdfbfbd77a84df677713c5f96ecf2e4d92766d6c7eac0b85625af6343658a7954697985aff78493f1cde1e8a7cde4a2d9ae4be09d68f59004d65dcb7e7dcaddd4402c4baee4230d834cb63dea7cae4b13a687a87f1403dae2e360640ccb536afdaf6ed4c38247ac98a765ecccc882fe71f3650e752308701fe9af06898d8196ae809cc0979b9f282b60497e34c07bfe03c22ef6e5edf5a381dddc9d699c6328d2064f9f4ce4caa79a82eb28869a4a96fc55ca131843495d3afaab84c5f802ffc54be4c490224dd8e5e32d0ea98611a1e96a44222138d47773c1d3a6d3e3d8f80198b780c67f5cb262992c445df9861f137af53e4afd2773f29d8a3e673ed56732215794401829d39805421551a06d2fb0e20c34fb1ea112b16e684b9e174e9da5fa26f39637758e540b72dec19c58aa1342425190824429a751bcbe137bf210a99dbfdd3c240551083fa9769c11ed63b57e1a47a9eeabc9ca9dff0f0000ffff010000ffff8b36c44026470000") gr, _ = gzip.NewReader(bytes.NewBuffer(bs)) bs, _ = ioutil.ReadAll(gr) Assets["app.js"] = bs diff --git a/gui/app.js b/gui/app.js index 44a85a150..cca006253 100644 --- a/gui/app.js +++ b/gui/app.js @@ -317,7 +317,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) { $scope.configInSync = false; $('#editNode').modal('hide'); nodeCfg = $scope.currentNode; - nodeCfg.NodeID = nodeCfg.NodeID.replace(/ /g, '').trim(); + nodeCfg.NodeID = nodeCfg.NodeID.replace(/ /g, '').replace(/-/g, '').trim(); nodeCfg.Addresses = nodeCfg.AddressesStr.split(',').map(function (x) { return x.trim(); }); done = false;