From a62b393d02fdfc49334b5ad4b1e847a711de741d Mon Sep 17 00:00:00 2001
From: Guillaume AMAT <guillaume.amat@informatique-libre.com>
Date: Wed, 12 Feb 2014 00:54:35 +0100
Subject: Update page title when navigating through directories

---
 apps/files/js/filelist.js | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'apps')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a855d6cbe59..7691135e620 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -18,6 +18,15 @@ window.FileList={
 			$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
 		});
 	},
+	/**
+	 * Sets a new page title
+	 */
+	setPageTitle: function(title){
+		// Sets the page title with the " - ownCloud" suffix as in templates
+		window.document.title = title + ' - ownCloud';
+		
+		return true;
+	},
 	/**
 	 * Returns the tr element for a given file name
 	 */
@@ -186,12 +195,22 @@ window.FileList={
 	changeDirectory: function(targetDir, changeUrl, force) {
 		var $dir = $('#dir'),
 			url,
-			currentDir = $dir.val() || '/';
+			currentDir = $dir.val() || '/',
+			baseDir = targetDir.split('/').pop(),
 		targetDir = targetDir || '/';
 		if (!force && currentDir === targetDir) {
 			return;
 		}
+		
+		if (baseDir !== '') {
+			FileList.setPageTitle(baseDir);
+		}
+		else {
+			FileList.setPageTitle(t('files', 'Files'));
+		}
+		
 		FileList.setCurrentDir(targetDir, changeUrl);
+		
 		$('#fileList').trigger(
 			jQuery.Event('changeDirectory', {
 				dir: targetDir,
@@ -811,7 +830,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');
@@ -1095,6 +1115,14 @@ $(document).ready(function() {
 			FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
 		}
 	}
-
+	
+	
+	baseDir = parseCurrentDirFromUrl().split('/').pop();
+	
+	if (baseDir !== '') {
+		FileList.setPageTitle(baseDir);
+	}
+	
+	
 	FileList.createFileSummary();
 });
-- 
cgit v1.2.3


From 01dc7c5482e6b7486695fdba865a1c88ab05358d Mon Sep 17 00:00:00 2001
From: Guillaume AMAT <guillaume.amat@informatique-libre.com>
Date: Thu, 13 Feb 2014 10:48:01 +0100
Subject: Gets the page title from oc_defaults in Files app

---
 apps/files/js/filelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7691135e620..14f03121ff6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -23,7 +23,7 @@ window.FileList={
 	 */
 	setPageTitle: function(title){
 		// Sets the page title with the " - ownCloud" suffix as in templates
-		window.document.title = title + ' - ownCloud';
+		window.document.title = title + ' - ' + oc_defaults.title;
 		
 		return true;
 	},
-- 
cgit v1.2.3


From 577559458dd7aa74e32ab62216a22bbc75009866 Mon Sep 17 00:00:00 2001
From: Guillaume AMAT <guillaume.amat@informatique-libre.com>
Date: Wed, 19 Feb 2014 22:50:49 +0100
Subject: Uses OC.basename instead of custom code

---
 apps/files/js/filelist.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apps')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 14f03121ff6..7d0818ef1ee 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -196,7 +196,7 @@ window.FileList={
 		var $dir = $('#dir'),
 			url,
 			currentDir = $dir.val() || '/',
-			baseDir = targetDir.split('/').pop(),
+			baseDir = OC.basename(targetDir),
 		targetDir = targetDir || '/';
 		if (!force && currentDir === targetDir) {
 			return;
@@ -1117,7 +1117,7 @@ $(document).ready(function() {
 	}
 	
 	
-	baseDir = parseCurrentDirFromUrl().split('/').pop();
+	baseDir = OC.basename(parseCurrentDirFromUrl());
 	
 	if (baseDir !== '') {
 		FileList.setPageTitle(baseDir);
-- 
cgit v1.2.3