Add option to ask before deleting pinned items even when just trashing

Author: martinkadlec0

options.html

@@ -155,10 +155,14 @@ <h3 class="section-header">Behaviour</h3>
 						</label>
 					</div>
 
-					<div class="settings-row learn-more" title="Ask when shift+deleting pinned items or removing pinned items from trash.">
+					<div class="settings-row learn-more" title="Ask to prevent accidental removal of pinned items.">
 						<label class="web-content-select-label">
-							<span class="selectLabel">Ask when completely removing pinned items:</span>
-							<input type="checkbox" id="askRmPinned" />
+							<span class="selectLabel">Ask when removing pinned items:</span>
+							<select id="askRmPinned">
+								<option value="none">Never</option>
+								<option value="trashed">On removal from trash</option>
+								<option value="all">Always</option>
+							</select>
 						</label>
 					</div>
 

scripts/app/staticdb/actions.js

@@ -621,8 +621,10 @@ return {
 			fn: function(e) {
 				var contentView = require('views/contentView');
 				if (!contentView.model) return;
+
+				askRmPinned = bg.settings.get('askRmPinned')
 				if (e.shiftKey) {
-					if (contentView.model.get('pinned') && bg.settings.get('askRmPinned')) {
+					if (contentView.model.get('pinned') && askRmPinned && askRmPinned != 'none') {
 						var conf = confirm(Locale.c.PIN_QUESTION_A + contentView.model.escape('title') + Locale.c.PIN_QUESTION_B);
 						if (!conf) {
 							return;
@@ -631,6 +633,13 @@ return {
 
 					contentView.model.markAsDeleted();
 				} else {
+					if (contentView.model.get('pinned') && askRmPinned == 'all') {
+						var conf = confirm(Locale.c.PIN_QUESTION_A + contentView.model.escape('title') + Locale.c.PIN_QUESTION_B);
+						if (!conf) {
+							return;
+						}
+					}
+
 					contentView.model.save({
 						trashed: true,
 						visited: true

scripts/app/views/articleList.js

@@ -677,6 +677,13 @@ function (BB, _, $, Groups, Group, GroupView, ItemView, selectable, Locale) {
 		 * @param view {views/ItemView} Removed article view
 		 */
 		removeItem: function(view) {
+			askRmPinned = bg.settings.get('askRmPinned')
+			if (view.model.get('pinned') && askRmPinned == 'all') {
+				var conf = confirm(Locale.c.PIN_QUESTION_A + view.model.escape('title') + Locale.c.PIN_QUESTION_B);
+				if (!conf) {
+					return;
+				}
+			}
 			view.model.save({ trashed: true, visited: true });
 			//this.destroyItem(view);
 		},
@@ -687,7 +694,8 @@ function (BB, _, $, Groups, Group, GroupView, ItemView, selectable, Locale) {
 		 * @param view {views/ItemView} Removed article view
 		 */
 		removeItemCompletely: function(view) {
-			if (view.model.get('pinned') && bg.settings.get('askRmPinned')) {
+			askRmPinned = bg.settings.get('askRmPinned')
+			if (view.model.get('pinned') && askRmPinned && askRmPinned != 'none') {
 				var conf = confirm(Locale.c.PIN_QUESTION_A + view.model.escape('title') + Locale.c.PIN_QUESTION_B);
 				if (!conf) {
 					return;

scripts/bgprocess/models/Settings.js

@@ -50,7 +50,7 @@ define(['backbone', 'preps/indexeddb'], function (BB) {
 			circularNavigation: true,
 			sortBy: 'date',
 			sortBy2: 'title',
-			askRmPinned: true,
+			askRmPinned: 'trashed',
 			titleIsLink: true,
 			soundNotifications: false,
 			defaultSound: '',