Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1

Update page title when navigating through directories (local)

2 files changed, 61 insertions, 3 deletions

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index d6cffde05de..35fbdeecd39 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -11,6 +11,7 @@
 /* global OC, t, n, FileList, FileActions, Files */
 /* global procesSelection, dragOptions, SVGSupport, replaceSVG */
 window.FileList={
+	appName: t('files', 'Files'),
 	useUndo:true,
 	postProcessList: function() {
 		$('#fileList tr').each(function() {
@@ -19,6 +20,21 @@ window.FileList={
 		});
 	},
 	/**
+	 * Sets a new page title
+	 */
+	setPageTitle: function(title){
+		if (title) {
+			title += ' - ';
+		} else {
+			title = '';
+		}
+		title += FileList.appName;
+		// Sets the page title with the " - ownCloud" suffix as in templates
+		window.document.title = title + ' - ' + oc_defaults.title;
+
+		return true;
+	},
+	/**
 	 * Returns the tr element for a given file name
 	 */
 	findFileEl: function(fileName){
@@ -204,7 +220,16 @@ window.FileList={
 		return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
 	},
 	setCurrentDir: function(targetDir, changeUrl) {
-		var url;
+		var url,
+			baseDir = OC.basename(targetDir);
+
+		if (baseDir !== '') {
+			FileList.setPageTitle(baseDir);
+		}
+		else {
+			FileList.setPageTitle();
+		}
+
 		$('#dir').val(targetDir);
 		if (changeUrl !== false) {
 			if (window.history.pushState && changeUrl !== false) {
@@ -847,7 +872,8 @@ window.FileList={
 };
 
 $(document).ready(function() {
-	var isPublic = !!$('#isPublic').val();
+	var baseDir,
+		isPublic = !!$('#isPublic').val();
 
 	// handle upload events
 	var file_upload_start = $('#file_upload_start');
@@ -1132,5 +1158,7 @@ $(document).ready(function() {
 		}
 	}
 
+	FileList.setCurrentDir(parseCurrentDirFromUrl(), false);
+
 	FileList.createFileSummary();
 });
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index f42abb6d029..a88459b0a9a 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -1,3 +1,4 @@
+/* globals OC, FileList, t */
 // override reload with own ajax call
 FileList.reload = function(){
 	FileList.showMask();
@@ -17,7 +18,36 @@ FileList.reload = function(){
 			FileList.reloadCallback(result);
 		}
 	});
-}
+};
+
+FileList.appName = t('files_trashbin', 'Deleted files');
+
+FileList._deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
+
+/**
+ * Convert a file name in the format filename.d12345 to the real file name.
+ * This will use basename.
+ * The name will not be changed if it has no ".d12345" suffix.
+ * @param name file name
+ * @return converted file name
+ */
+FileList.getDeletedFileName = function(name) {
+	name = OC.basename(name);
+	var match = FileList._deletedRegExp.exec(name);
+	if (match && match.length > 1) {
+		name = match[1];
+	}
+	return name;
+};
+var oldSetCurrentDir = FileList.setCurrentDir;
+FileList.setCurrentDir = function(targetDir) {
+	oldSetCurrentDir.apply(this, arguments);
+
+	var baseDir = OC.basename(targetDir);
+	if (baseDir !== '') {
+		FileList.setPageTitle(FileList.getDeletedFileName(baseDir));
+	}
+};
 
 FileList.linkTo = function(dir){
 	return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');