Added delete note button; Removed save note button; Renamed save and …

…close button to "Save";
plan889 · Aug 25, 2011 · b8fc9ba · b8fc9ba
1 parent 6a1cdb6
commit b8fc9ba
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 1 deletion.
diff --git a/js/helpers/dialogs.js b/js/helpers/dialogs.js
@@ -317,6 +317,43 @@ dialogs.openTaskDeleteDialog = function(deleteElement) {
 	}
 };
 
+
+/**
+ * Open a prompt asking for the deletion of a note
+ *
+ * @author Adam Renklint
+ */
+dialogs.openNoteDeleteDialog = function() {
+	if ($("[role='dialog']").length == 0)
+	{
+		var buttons = {};
+		buttons[wunderlist.language.data.delete_note_no]  = function() { $(this).dialog('close'); };
+		buttons[wunderlist.language.data.delete_note_yes] = function() {
+			$('textarea#noteTextarea').val('');
+			$('input#save-and-close').click();
+			dialogs.closeDialog(dialogs.deleteNoteDialog);
+		};
+
+		dialogs.deleteNoteDialog = $('<div></div>').dialog({
+			autoOpen    : false,
+			draggable   : false,
+			modal       : true,
+			closeOnEscape: true,
+			dialogClass : 'dialog-delete-task',
+			title       : wunderlist.language.data.delete_note_question,
+			buttons     : buttons,
+			open        : function(event, ui) {
+				$('.ui-dialog-buttonset button:first').focus();
+				$('.ui-dialog-buttonset button:first').addClass("input-bold");
+			}
+		});
+
+		dialogs.openDialog(dialogs.deleteNoteDialog);
+
+		$('.ui-widget-overlay').removeClass('ui-widget-overlay-wood');
+	}
+};
+
 /**
  * Open a prompt asking for the deletion of a list
  *

diff --git a/js/notes/note.js b/js/notes/note.js
@@ -87,6 +87,16 @@ $(function() {
 
 	$('span.hint').text(wunderlist.ucfirst(mainWindow.settings.shortcutkey) +' + '+ wunderlist.language.data.return_key +': ' + wunderlist.language.data.save_and_close_changes);
 
+	$('input#delete').live('click', function() {
+		if (Titanium.App.Properties.getString('delete_prompt', '1') == 1) {
+			dialogs.openNoteDeleteDialog();
+		} else {
+			$('textarea#noteTextarea').val('');
+			$('input#save-and-close').click();
+		}
+
+	});
+
 	// Save / Edit Button
 	$('input#save').live('click', function() {		
 		mainContent = mainWindow.document.getElementById("content");

diff --git a/language/english.json b/language/english.json
@@ -8,6 +8,9 @@
 	"delete_task_question":	    "Do you really want to delete this task?",
 	"delete_task_no":		    "No, I'm Sorry",
 	"delete_task_yes":		    "Yes, delete this task",
+	"delete_note_question":		"Do you really want to delete this note?",
+	"delete_note_no":		    "No, I'm Sorry",
+	"delete_note_yes":		    "Yes, delete this note",
 	"search":   			    "Search here...",
 	"add_task":  			    "Add your task here",
 	"delete_task":  		    "Delete Task",

diff --git a/language/german.json b/language/german.json
@@ -8,6 +8,9 @@
    	"delete_task_question":	    "Willst du diese Aufgabe wirklich löschen?",
    	"delete_task_no":		    "Nein, lieber nicht",
    	"delete_task_yes":		    "Ja, löschen",
+   	"delete_note_question":	    "Willst du diese Notiz wirklich löschen?",
+   	"delete_note_no":		    "Nein, lieber nicht",
+   	"delete_note_yes":		    "Ja, löschen",
     "search":   			    "Suche...",
     "add_task":  			    "Aufgabe hinzufügen",
     "delete_task":  		    "Aufgabe löschen",

diff --git a/note.html b/note.html
@@ -10,8 +10,10 @@
 		<link type="text/css" rel="stylesheet" href="css/dialogs.css"/>
 
 		<script type="text/javascript" src="js/libraries/jquery-1.6.min.js"></script>
+		<script type="text/javascript" src="js/libraries/jquery.ui.1.8.10.min.js"></script>
 		<script type="text/javascript" src="js/libraries/shortcuts.js"></script>
 		<script type="text/javascript" src="js/notes/note.js"></script>
+		<script type="text/javascript" src="js/helpers/dialogs.js"></script>
 	</head>
 
 	<body>
@@ -30,7 +32,7 @@
 			<div class="notes_buttons">
 				<span id="hint" class="hint"></span>
 				<input id="save-and-close" class="input-button button-login" type="submit" value="Save & Close" />
-				<input id="save" class="input-button" type="submit" value="Save" />
+				<input id="delete" class="input-button destructive" type="submit" value="Delete" />
 			</div>
 		</div>