Merge branch 'master' into external_storage_ui_feedback

Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php

3 files changed, 17 insertions, 17 deletions

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 9314a4c7927..a8bbb7b02e2 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr.OC_Filestorage_Dropbox').each(function() {
+	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox').each(function() {
 		var configured = $(this).find('[data-parameter="configured"]');
 		if ($(configured).val() == 'true') {
 			$(this).find('.configuration input').attr('disabled', 'disabled');
@@ -37,18 +37,18 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('paste', function() {
+	$('#externalStorage tbody').on('paste', 'tr.OC_Filestorage_Dropbox td', function() {
 		var tr = $(this).parent();
 		setTimeout(function() {
 			onDropboxInputsChange(tr);
 		}, 20);
 	});
 
-	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() {
+	$('#externalStorage tbody').on('keyup', 'tr.OC_Filestorage_Dropbox td', function() {
 		onDropboxInputsChange($(this).parent());
 	});
 
-	$('#externalStorage tbody tr.OC_Filestorage_Dropbox .chzn-select').live('change', function() {
+	$('#externalStorage tbody').on('change', 'tr.OC_Filestorage_Dropbox .chzn-select', function() {
 		onDropboxInputsChange($(this).parent().parent());
 	});
 
@@ -72,7 +72,7 @@ $(document).ready(function() {
 		}
 	}
 
-	$('.dropbox').live('click', function(event) {
+	$('.dropbox').on('click', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index ad6fc6a0f9a..46333d89d68 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
 		setupGoogleRow(tr);
 	});
 
-	$('#selectBackend').live('change', function() {
+	$('#selectBackend').on('change', function() {
 		if ($(this).val() == 'OC_Filestorage_Google') {
 			setupGoogleRow($('#externalStorage tbody>tr:last').prev('tr'));
 		}
@@ -43,18 +43,18 @@ $(document).ready(function() {
 		}
 	}
 
-	$('#externalStorage tbody tr.OC_Filestorage_Google td').live('paste', function() {
+	$('#externalStorage tbody').on('paste', 'tr.OC_Filestorage_Google td', function() {
 		var tr = $(this).parent();
 		setTimeout(function() {
 			onGoogleInputsChange(tr);
 		}, 20);
 	});
 
-	$('#externalStorage tbody tr.OC_Filestorage_Google td').live('keyup', function() {
+	$('#externalStorage tbody').on('keyup', 'tr.OC_Filestorage_Google td', function() {
 		onGoogleInputsChange($(this).parent());
 	});
 
-	$('#externalStorage tbody tr.OC_Filestorage_Google .chzn-select').live('change', function() {
+	$('#externalStorage tbody').on('change', 'tr.OC_Filestorage_Google .chzn-select', function() {
 		onGoogleInputsChange($(this).parent().parent());
 	});
 
@@ -73,7 +73,7 @@ $(document).ready(function() {
 		}
 	}
 
-	$('.google').live('click', function(event) {
+	$('.google').on('click', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var configured = $(this).parent().find('[data-parameter="configured"]');
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 2a8d8d2c284..5dffbce5bdf 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -146,7 +146,7 @@ OC.MountConfig={
 $(document).ready(function() {
 	$('.chzn-select').chosen();
 
-	$('#selectBackend').live('change', function() {
+	$('#selectBackend').on('change', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
 		$('#externalStorage tbody tr').last().find('.mountPoint input').val('');
@@ -176,7 +176,7 @@ $(document).ready(function() {
 						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
 					}
 				});
-				if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass).length == 1) {
+				if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length == 1) {
 					OC.addScript('files_external', parameters['custom']);
 				}
 				return false;
@@ -220,7 +220,7 @@ $(document).ready(function() {
 		return defaultMountPoint+append;
 	}
 
-	$('#externalStorage td').live('paste', function() {
+	$('#externalStorage').on('paste', 'td', function() {
 		var tr = $(this).parent();
 		setTimeout(function() {
 			OC.MountConfig.saveStorage(tr);
@@ -229,7 +229,7 @@ $(document).ready(function() {
 
 	var timer;
 
-	$('#externalStorage td input').live('keyup', function() {
+	$('#externalStorage').on('keyup', 'td input', function() {
 		clearTimeout(timer);
 		var tr = $(this).parent().parent();
 		if ($(this).val) {
@@ -239,15 +239,15 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage td input:checkbox').live('change', function() {
+	$('#externalStorage').on('change', 'td input:checkbox', function() {
 		OC.MountConfig.saveStorage($(this).parent().parent().parent());
 	});
 
-	$('.applicable .chzn-select').live('change', function() {
+	$('.applicable').on('change', '.chzn-select', function() {
 		OC.MountConfig.saveStorage($(this).parent().parent());
 	});
 
-	$('td.remove>img').live('click', function() {
+	$('td.remove>img').on('click', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if ( ! mountPoint) {