Handle UI in restart/shutdown

auto/gui.files.go

@@ -28,7 +28,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["angular.min.js"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7dff73db36b2f8effe2b107d72a594c89493f43af789e3f4b56e7acfd734c9c471df9b717d6f2811b25853a4ca2f763c89fff7b7bb00497ca56827cd5d679e26912562b1582c168bddc5029acdd861beb92e92f355c5c68713f678efd1d7ec1fd1453e67dfe7c5398bb21820b2aa48e6759517251b979cb36ac5d9e1eb57efde1e7d7ff2eef5db63b64c523e097700dd7769ca085dc90a5ef2e292c7213b2939cb97502d295999d7c582b3451e73065fcff34b5e643c66f36b688cfd7cf46eb7acae538eb8d264c1b3129b8b2ab680d23967cbbc0692928c68787974f8e2d5f10b6a3edcd9993df8ad4c93ac62f322bf82b69fb2aaa8f914dacaaa24ab79f37d93d625fe17dfd98319d43c4ff37994b2fb4fd9324a4b008ab2f33a8d0af91d8176821a3e94c08b4515ecefec5c46052bafb305742b3b67074d8d709dc775cac7415b164cd969b089ca45946e0abe5855615544599946150fce26fb84a82ed27904e80f58007c43fcf8f4324a93f825202ea1e07414f3d174c4337c2be16d59c0dba682b7f272740614b52d86d0e565723e5ed6f020c93336bebfaaaacd9b22bf4c625e4cd9fd9682e6d9847dd861f0d200c3982fa33aadcaf07d592cff9347f0ec55b42632ff7bf7f0f8ed8fbbeff20b9e01b95bea1ee6f945c29bba5a4d51d52228046e1f5751952c7e84e12d5fe6d8f85810892f60e53279ff940529f0673798b60565bd1405e16f659e05f4fc06d88cff751655459ea680347871c9b3eab02a52182a8567e522df802850b75afed0c3308dca8a6a4177b23a4d050370ccf20c64107b4982d33dc71a473fc0f33dd965929f7ab1e065f96386f06dc37154454d7bf84a966c7c4fe0551f2be4dce7eba41a072747af092a98ec6b502d4d28f05dd1cd8ed684a4f039db335b4182c2655ebc88162b45a83832c084c517f0b6cc614ea6f9f9784450a329a3bf6112379faa6b64aef84c3ddeb7f068bdb36a19156e94ef37fb5dd71c2386cd9d52a7529e9d572bb6cb1e9d75b5dba132ab02f50ae29257ef9235cfeb4ae1893540283ce139afc6cd147fc88219d15f7e5b26d9821f04f0483439d1aa86523ac6ad9418e5bc28f2624cef50a6f47ecafebab7271fdc28e22641b70adb40595b2e7b854d990044c89f9471bd84a40930e3e051d035d0d7b8d5708f4e3a6e9ef6eb255597c3e7345f4408d57013471d34e5e50f502c744ff3143af4fa274d25e0535c7ca2a2122b9a1c4055ef2df2f526e544c701fb70b3af97e1a2e37b7e94618fb406bbf28c53df4abb32f18a96bf33ed39acb23cb5c1d7d7347183407b9a01b003c7a6c8ab7c91a7872b5842c006d14456c2147c931715b02fb21b13656f80bd09bff2d676740a8ca8ec0576cc26b5de9c17b0d21d65cb5cd6730be1c3d10c17bed1a495b74e40b0a054e793587fb2f34ed24199b3313e4e482ae0cf338228a54684270f1f9a531201009ce04e93337ddaa3dee8ec9530c962fefef5926899b0e707f6a242dd6a6517977b016c2f03f382471786b237d4cacd4413d3fb79361eb593418cefb1e0d3489d4a2e26a1de6f6ac2484505ac799350679f582eb16786d2eaedcf4d6b8b68c2c979fc5d27fe2d7450ac03b0627ee0a962dcc0c33829e47350de4931514b519560214e35f57995d78b15169c6c62343b45d18d49c6d1c24344c1d760a83be9b08b1a22e2fc2a4bc16c7312026a9b174979d192620e5f67cca803466a17acf34263bdac9664b03029fcbe3f0efe5fc6ababbcb8a0d9164c506d44e9385881851918909deaeb872b5775855d734399a3db7445ae95dbfb42c65e478b2561be3e7d98478b8bb8c837c0dc92ec6668ec825fcff3a888a51b73b35518895c34bbb9548a0328c689130b05092564cbe9334555d9c2ec42bd78e6b12f4cb0107bc3a5d51656f9a02ebc84099c1ea10e1212ffc9fd006f030665f516281ab7b44d146b101c56d11453d64824bd2e49db46e0198b7588fcd92b70255751c185578cc8d85552ad4253a6690551b9f10a71388c71c47db8b4e445d27dd8d2d40012a2a31fa64ced4dcbd93e697e0b33bee25f82b9fe4e1014f6c4a6df493376f687a494a6c6208a410a398ca66da49c361d0077e06c4b9b87b7689066fe96e63c73c607aee9f2b69d6cbe299fb2bda9550216b9afe828fbfebae2e5bbbc8a5227c0ebbada02f15d1cc32802fa96c2089ee870378366f721599414127030d6e4a9668686af37c4a6f0e4ed77600f6c2ab4fb1cd6094ce7a325abcbe89c3361e7a14dbc8a4a3607e38d651c262b8759dde0c8608ac77c814a3e9e9a9860b25f45e07956398bca0b8a5d817950e0f77574c159c416ab3c59f0907d5f936a88f32ca8a88e890aaacceb7344b166715d2051b8ec25518a6e550dfe40999372e115a2a5b00b69160b11105181172622739c2d93a2acd865522655c8fe6bc5331977131840476d30a067138421c2161780ad73526a5186b1ba82ade0ad64d1793e45aa64ef4d1cbfd7b0dea1b9b5a395a0ce20b27e41aa7005c817f51afd704115cefa345af0f16cfced53f8f7cf8fe183fd5fcb0793ae127cfbf500dec6a7ffdc3f7b30091fdc9f7cfc27bccfa66c74ffd16862dbb0f7baca2e8bd52001881a75150e46e01ba2ab05aae90a8ccb876cb4bf8edeef821051d193bd078fbf7ef0e49bbd3dc39a651c838c8ea90a043d5458f04cc5becb04ae078ff6c069b52be30bcd85faee46424be020e39b743c9fe7301d79fc23bc97aa0bd3ce5255db93de369609a007d9aa8021ef1052372beee96d9d423d4b3f3a40508ee4d39ef00331cfe9f9937df22d924301089e612cfbe4ed11ae4e7906a2213ae572cccc588bd6986afdd0522f4d1e7b34f0a585d854564d89536259748da419359b32149f29b9e59679e861616364dfb847f6f81a8cfbb5c652372b4b020c86b24af7f16905c1cffb2e2081dac94217eb04c9238b6d37fd3d35cc2ac17b73fdc11258630e54fa6d33adaa8b4ce17ecf8ce81ac57941d8ff8da64767fd7e8ba4d11c9134065f7df659a3db4c4dcba7d8a0d5598794985594508df9bae99bb5261e6d022ba5fb3b4e2c38c6558e2b1c4cc40585a8f7dc54b4719bc57a83db6077e83ab20c6ba3448efea742736dd4078faf660bcd4d949f3df8c28e3d3cf0720a4839f3a3456640e5479f614c42d1578c4002453344ed190e97825026dd9475737dea1d817f8dea3d6c1d0174e2cb013a58711d062b621440b04180959d39a21bbd154653c708b3dbc69f27c074eab06e73c5c62828e16aa8afb38cc43fa10d609f5610aa0fa71d18ebafafb23760edf0a2ba866a139f98fbc5db96b0aab8f660a15d2570ba4272b080fc9f2370e8c1fe1bc318ff8d3d10bc2408d59b020e39bc38130a9957c50ea9d25a160e5c6fd39a9fe66f5b03f3367ec31651b55881e3e563adc5148f62b3bbe000f499a1f8726e260c5bfcbb4953deda02a020dc90792636326e6bebb4Line truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7dff73db36b2f8effe2b107d729594c89493f43af789e3f4b54e72cfd734c9c471df9b71dd37940859ac2952e5173b9ec4fffbdb5d8024be5294e3e6ee669e26912562b1582c168bddc5029a4ed961b6becee3f365c9468763f678efd1b7ec1fe14536633f66f9390bd30820d2328f675599e5051b159cb372c9d9e1db371fde1ffd78f2e1edfb63b688133e0e7600dd0f49c2085dc1725ef0fc9247013b2938cb16502d2e589155f99cb3791671065fcfb34b9ea73c62b36b688cfd7cf461b728af138eb89278ced3029b0b4b3687d219678bac0292e29468787d74f8f2cdf14b6a3ed8d9993ef8bd48e2b464b33cbb82b69fb232aff804da4acb38ad78fd7d9d5405fe17dfd98329d43c4fb25998b0fb4fd9224c0a000ad3f32a0973f91d817686157c288017f372b8bfb37319e6acb84ee7d0adf49c1dd43582551655091f0d9bb2e1849d0ed761310f9375cee7cb3228f3302d92b0e4c3b3f13e21aaf2641602fa033604be217e7c7a192671f41a101750703a88f86032e029be15f0b6c8e16d5dc25b713938038a9a1603e8f2223e1f2d2a781067291bdd5f96e5fa5d9e5dc611cf27ec7e4341fd6ccc3eed3078698041c41761959445f0b1c817ffc94378f6265c1199ffbd7b78fcfed5ee87ec82a740ee86ba87597611f3baae565354b5080a80dbc76558c6f35730bcc5eb0c1b1f0922f105ac5cc41f9fb26102fcd91d4e9a82a25a8882e0f7224b87f4fc06d88cff7516957996248074f8f292a7e561992730540acf8a79b60651a06e35fca18741121625d582eea455920806e0986529c820f69204a77d8e358e5ec0f33dd965929f6a3ee745f12a45f8a6e1282cc3ba3d7cc50b36ba27f0aa8f1572eef3555c8e8627476f096a38ded7a01a9a50e0dba29b1dad0949e173b667b68204058b2c7f19ce978a50716480098b2fe06d91c19c4cb2f3d180a00613467f8338aa3f95d7c85cf1997abc6fe1d17a67d5322adc28df6ff6dbae39460c9b3ba54e253c3d2f976c973d3a6b6b3743655605ea15c4052f3fc42b9e55a5c2136b80507882735e8eea29fe900da7447ff17d11a7737e308447a2c9b1563590d2316aa4c428e7799ee5237a8732a5f713f6d7bd3df9e046113709ba51d87acada62d1296cca042042ee9071490c341c3c1ade1dc31eed591cdb9282aed6ad963b94d171fdb45b21a94a1c3e27d93c44a89a8d38dca0222f5f40b1503af553e8d0db9f345d804f71d509f3522c6572e4548537cf56eb84131d07ecd3cdbe5e86ab8deff9518a3dd21a6ccb534e7d2beccac42b5af7ceb4e7b0bcf2c4065f5dd38c1d0eb5a729003b70acf3accce65972b884b5038c0f4d56254cced7595e02fb42bb3151f60ed81bf32b6f6d47a7c07a4a5f62c76c52abf5790e4bdc51bac8643db7103e1c4c71c51b8c1b796b05040b0a75228985273d6f451db4381be1e398a402fe3c238842aa4278f2f0a139171100c009ee343ed3e73b2a8cd65009e234e21fdf2e8896317b7e60af26d4ad4676719d17c0b6fe9fe53cbc30b4bca14f6ec69a98decfd2d1a0990c627c8f059f06ea54723109157e5d13462acc61b11b073afbc43a893d33b455677f6e1a2344134ecea31f5af16fa087f96a08e6cb0b9e28560d3c8ce25c3e07ad1de763b514550916e254539f9759355f62c1c93a427b5314dd98641ccd3d44e47c0516ba930ebba82622caaed204ec352721b0d0f13c2e2e1a52cce16bad1875c048ed82599e6bac570d0da7f523f1c6292c59ca6397b66baa8c86ff2fe5e555965fd0541d8e51e784c968b804bb54430e902da66eb8625995c8173794291a351fe40abb3d23eca5998cc8965a4b807dbdfe340be717519ead61ec0ab2c7819c0b7e3dcbc23c92eed1cd4659a70ea139cfa5ceedd1279c9791d0bf504236a2de1d754510e61caadd338fdd628205d81b2eadc1a0cc7a75e135e887e408559c98505fdc0ff062605096ef81a25143db58b132c111164d31650946d2ab829479081eb758e6c84fbe02177519e65c78db888c5dc5e5323067042d502a37de200e87918fb80f1796bc48ba0f1b9a6a404274f462c2d4de349ced92f7f7a0504afe3598ebef0441614f6cfa9d3463675fc485b4647a510c52c861346d1be8b4ee00b819671bda3cdca2419af91b9af3cc191fb8b65434eda4b375f194ed4dac12b0f47d4547e98fd7252f3e6465983801de56e506881fa2084611d0371486f04487bbe935bb0fc960a5508383b1264f352b3778bb26360527ef7f0073635da259e9307e603a1f2d585584e79c09331217a16558b019d8862ce5305939ccea1a470a533ce273d4e6d1c4c40493fd2a048fb6cc58585c504c0cac8f1cbfafc20bce42365f66f19c07ecc78a544394a5c392ea98a8a0caac3a47142b16553912858b661c26e8ae55e06e141929175e225a0ae79066b110011125787722e2c7d922ce8b925dc6455c06ecbf963c95f13c810174d41a03853641187a6c7001d82a23a516a61803ccd912de0a169e6713a44af6dec4f14705eb1d5a733b5a09ea0c22eb17a40a57806c5eadd0bf1754e1ac4fc2391f4d47df3f857fbf7d0e1eecff5a3c18b795e0dbaf07f0363afd6dffecc13878707ffcf937789f4ed8e0fea3c1d83691efb5955d06b141021035682b1c0cc0f5444f0e54d315d8ae0fd9607f157edc0521a2a2277b0f1e7ffbe0c9777b7b86b1cc38062f1d5315087aa8b0e0998a7d97095c0fc827b62be30bcd85eaf6464243602fdb9e743c9f65301d79f40ade0bd5436a66a9aaed496f1bcb04d0836c55c09077086958497a5ba750cfd28f0e109423f9b423ac41cc730616c83ef91ec9a188104f31467ef2fe0857a72c05d1109d72f97d660c476b4cb57e68a997268f3d1af8d242772aab26c429b12cba46d28cc68990ca84bc7ecb3cf4b0b036d16fdc237b7c0dbec34a63a99b9505010efbb24a0f21d00a829ff75d4002b593852ed609920716db6eba7b6a985582f7e6fa8325b0c61ca8f4db665a59e5a9c2fd8e19d1368af382b0ff0b4d8fd6fafd1e49a33922691c7e73e7b346b799ea964fb141abb30e2931ab289120f375d3356b4d3cda04564af7779c58708ccb0c57389888730a7defb9a968c242f3d51ab7d76ed1756419d646891cfc4f89e6daa00b1e5ff5d69c9b283f7bf0851d7b78e0e5149072e6478bcc80ca8fee604c02d1570c7002455344ed190e97825026dd84b5737de21d817f8eea3d6c1c0174e28b1e3a58711d7a2b621440b0418095ad39a21bbd25066b4708b3db84b7c7c074eab06e7345c62828d170a8afb38cc43fa68d659f5610aa0fa71d18eb6fafd27760edf0bcbc866a639f98fbc5db96b032bff660a1dd2a70ba0272b080fc9f4370e8c1fe1bc118ff8d3d10bc2408d59b020e39bc38130a9957460ea9d25a160e5c67d39a9fe66f5b03f3367ec3e661395f82e3e563adc5148f62b3bbe000f499a1f872ee55f45bfcdb49536cLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["app.js"] = bs

gui/app.js

@@ -55,10 +55,10 @@ syncthing.controller('EventCtrl', function ($scope, $http) {
             online = false;
         }
         setTimeout(function () {
-            $http.get(urlbase + '/events?since=' + lastID)
+            $http.get(urlbase + '/events?limit=1')
             .success(successFn)
             .error(errorFn);
-        }, 500);
+        }, 1000);
     };
 
     $http.get(urlbase + '/events?limit=1')
@@ -118,13 +118,16 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     }
 
     $scope.$on('UIOnline', function (event, arg) {
+        console.log('UIOnline');
         $scope.init();
+        restarting = false;
         $('#networkError').modal('hide');
         $('#restarting').modal('hide');
         $('#shutdown').modal('hide');
     });
 
     $scope.$on('UIOffline', function (event, arg) {
+        console.log('UIOffline');
         if (!restarting) {
             $('#networkError').modal({backdrop: 'static', keyboard: false});
         }