PreRelease fixes

dev/Settings/User/Accounts.js

@@ -33,10 +33,12 @@
 		this.identityForDeletion = ko.observable(null).deleteAccessHelper();
 	}
 
-	AccountsUserSettings.prototype.scrollableOptions = function ()
+	AccountsUserSettings.prototype.scrollableOptions = function (sWrapper)
 	{
 		return {
-			handle: '.drag-handle'
+			handle: '.drag-handle',
+			containment: sWrapper || 'parent',
+			axis: 'y'
 		};
 	};
 

dev/Settings/User/Filters.js

@@ -110,10 +110,12 @@
 		}, this);
 	}
 
-	FiltersUserSettings.prototype.scrollableOptions = function ()
+	FiltersUserSettings.prototype.scrollableOptions = function (sWrapper)
 	{
 		return {
-			handle: '.drag-handle'
+			handle: '.drag-handle',
+			containment: sWrapper || 'parent',
+			axis: 'y'
 		};
 	};
 

dev/Settings/User/OpenPgp.js

@@ -6,6 +6,7 @@
 	var
 		_ = require('_'),
 		ko = require('ko'),
+		window = require('window'),
 
 		Utils = require('Common/Utils'),
 
@@ -24,6 +25,8 @@
 		this.openpgpkeysPrivate = PgpStore.openpgpkeysPrivate;
 
 		this.openPgpKeyForDeletion = ko.observable(null).deleteAccessHelper();
+
+		this.isHttps = window.document && window.document.location ? 'https:' === window.document.location.protocol : false;
 	}
 
 	OpenPgpUserSettings.prototype.addOpenPgpKey = function ()

dev/Settings/User/Templates.js

@@ -31,10 +31,12 @@
 		this.templateForDeletion = ko.observable(null).deleteAccessHelper();
 	}
 
-	TemplatesUserSettings.prototype.scrollableOptions = function ()
+	TemplatesUserSettings.prototype.scrollableOptions = function (sWrapper)
 	{
 		return {
-			handle: '.drag-handle'
+			handle: '.drag-handle',
+			containment: sWrapper || 'parent',
+			axis: 'y'
 		};
 	};