Merge pull request #1654 from AudriusButkevicius/fixes

Fix capitalization (fixes #1652, fixes #1649)

gui/scripts/syncthing/app.js

@@ -49,22 +49,22 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi
 // @TODO: extract global level functions into seperate service(s)
 
 function deviceCompare(a, b) {
-    if (typeof a.Name !== 'undefined' && typeof b.Name !== 'undefined') {
-        if (a.Name < b.Name)
+    if (typeof a.name !== 'undefined' && typeof b.name !== 'undefined') {
+        if (a.name < b.name)
             return -1;
-        return a.Name > b.Name;
+        return a.name > b.bame;
     }
-    if (a.DeviceID < b.DeviceID) {
+    if (a.deviceID < b.deviceID) {
         return -1;
     }
-    return a.DeviceID > b.DeviceID;
+    return a.deviceID > b.deviceID;
 }
 
 function folderCompare(a, b) {
-    if (a.ID < b.ID) {
+    if (a.id < b.id) {
         return -1;
     }
-    return a.ID > b.ID;
+    return a.id > b.id;
 }
 
 function folderMap(l) {

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

@@ -981,7 +981,7 @@ angular.module('syncthing.core')
         $scope.addFolderAndShare = function (folder, device) {
             $scope.dismissFolderRejection(folder, device);
             $scope.currentFolder = {
-                ID: folder,
+                id: folder,
                 selectedDevices: {}
             };
             $scope.currentFolder.selectedDevices[device] = true;