Merge pull request #1230 from AudriusButkevicius/separator

Expose and use path separator (fixes #1163)

cmd/syncthing/gui.go

@@ -449,6 +449,7 @@ func restGetSystem(w http.ResponseWriter, r *http.Request) {
 	}
 	cpuUsageLock.RUnlock()
 	res["cpuPercent"] = cpusum / 10
+	res["pathSeparator"] = string(filepath.Separator)
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(w).Encode(res)

gui/index.html

@@ -692,7 +692,7 @@
           </dl>
         </div>
         <div class="modal-footer">
-          <div class="pull-left"><span translate>Editing</span> <code>{{currentFolder.Path}}/.stignore</code></div>
+          <div class="pull-left"><span translate>Editing</span> <code>{{currentFolder.Path}}{{system.pathSeparator}}.stignore</code></div>
           <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="saveIgnores()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
         </div>

gui/scripts/syncthing/core/controllers/syncthingController.js

@@ -889,6 +889,9 @@ angular.module('syncthing.core')
 
         $scope.editFolder = function (folderCfg) {
             $scope.currentFolder = angular.copy(folderCfg);
+            if ($scope.currentFolder.Path.slice(-1) == $scope.system.pathSeparator) {
+                $scope.currentFolder.Path = $scope.currentFolder.Path.slice(0, -1);
+            }
             $scope.currentFolder.selectedDevices = {};
             $scope.currentFolder.Devices.forEach(function (n) {
                 $scope.currentFolder.selectedDevices[n.DeviceID] = true;