From 5c3576bdb4c42eb07f63a18a850b04e4ac3a01a2 Mon Sep 17 00:00:00 2001
From: Robert Byrne <bobbyrne01@gmail.com>
Date: Sun, 1 Dec 2013 23:56:50 +0000
Subject: [PATCH] #27 Page name retrieved if preference enabled

---
 data/js/ConfirmPanel.js |  2 ++
 lib/Chrome.js           | 13 ++++++++++++-
 lib/Panel.js            |  2 ++
 lib/Tab.js              |  5 +++++
 package.json            |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/data/js/ConfirmPanel.js b/data/js/ConfirmPanel.js
index 4e2e679..440b883 100644
--- a/data/js/ConfirmPanel.js
+++ b/data/js/ConfirmPanel.js
@@ -35,6 +35,7 @@ var SaveTextToFile_Panel = {
 			    +'"timestampInLine":"' + document.getElementById("timestampInLine").checked + '", '
 			    +'"lineSeparator":"' + document.getElementById("lineSeparator").checked + '", '
 			    +'"currentURL":"' + document.getElementById("currentURL").checked + '", '
+			    +'"pagenameForFilename":"' + document.getElementById("pagenameForFilename").checked + '", '
 			    +'"saveMode":"' + document.getElementById("saveMode").value + '", '
 			    +'"confirmPanel":"' + document.getElementById("confirmPanel").checked + '"'
 			    +'}';
@@ -59,6 +60,7 @@ self.port.on("prefs", function (prefs) {
 	document.getElementById("timestampInLine").checked = parsedPrefs.timestampInLine;
 	document.getElementById("lineSeparator").checked = parsedPrefs.lineSeparator;
 	document.getElementById("currentURL").checked = parsedPrefs.currentURL;
+	document.getElementById("pagenameForFilename").checked = parsedPrefs.pagenameForFilename;
 	document.getElementById("saveMode").value = parsedPrefs.saveMode;
 	document.getElementById("confirmPanel").checked = parsedPrefs.confirmPanel;
 });
\ No newline at end of file
diff --git a/lib/Chrome.js b/lib/Chrome.js
index ad6c20f..34d287c 100644
--- a/lib/Chrome.js
+++ b/lib/Chrome.js
@@ -58,12 +58,23 @@ exports.saveTo = function(selectedText){
 	Cu.import("resource://gre/modules/NetUtil.jsm");
     Cu.import("resource://gre/modules/FileUtils.jsm");
     
+    var filename;
+    
+    if (Preference.get('pagenameForFilename')){
+    	
+    	filename = Tab.getTitle();
+    	
+    }else{
+    	
+    	filename = Preference.get('fileName');
+    }
+    
     var ostream,
     	string = '\n\n',
     	currentTime = new Date(),
     	date = currentTime.getDate() + "-" + (currentTime.getMonth() + 1) + "-" + currentTime.getFullYear(),
     	time = currentTime.getHours() + "-" + currentTime.getMinutes() + "-" + currentTime.getSeconds(),
-    	file = createFileObject(Preference.get('pathToFile'), Preference.get('fileName'));
+    	file = createFileObject(Preference.get('pathToFile'), filename);
 	
 	try{        
         
diff --git a/lib/Panel.js b/lib/Panel.js
index 456d32a..5b30d78 100644
--- a/lib/Panel.js
+++ b/lib/Panel.js
@@ -35,6 +35,7 @@ exports.init = function() {
 		Preference.set('timestampInLine', parsedPerfs.timestampInLine === "true");
 		Preference.set('lineSeparator', parsedPerfs.lineSeparator === "true");
 		Preference.set('currentURL', parsedPerfs.currentURL === "true");
+		Preference.set('pagenameForFilename', parsedPerfs.pagenameForFilename === "true");
 		Preference.set('saveMode', parseInt(parsedPerfs.saveMode));
 		Preference.set('confirmPanel', parsedPerfs.confirmPanel === "true");
 		
@@ -62,6 +63,7 @@ function getPreferences() {
 	    +'"timestampInLine":' + Preference.get('timestampInLine') + ', '
 	    +'"lineSeparator":' + Preference.get('lineSeparator') + ', '
 	    +'"currentURL":' + Preference.get('currentURL') + ', '
+	    +'"pagenameForFilename":' + Preference.get('pagenameForFilename') + ', '
 	    +'"saveMode":' + Preference.get('saveMode') + ', '
 	    +'"confirmPanel":' + Preference.get('confirmPanel') + ''
 	    +'}';
diff --git a/lib/Tab.js b/lib/Tab.js
index 2fd475c..0c5fd48 100644
--- a/lib/Tab.js
+++ b/lib/Tab.js
@@ -1,5 +1,10 @@
 var tab = require('tabs');
 
+exports.getTitle = function() {
+	
+    return tab.activeTab.title;
+}
+
 exports.getURL = function() {
 	
     return tab.activeTab.url;
diff --git a/package.json b/package.json
index a9ee55f..fc85e7c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "Saves highlighted text to a file in a specified directory",
   "author": "Robert Byrne",
   "license": "GNU GPL v3",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "permissions": {"private-browsing": true},
   "preferences": [{
     	"name": "fileName",