Merge pull request #144 from cxw42/v01i

v0.1.18 deployment

Makefile

@@ -34,6 +34,7 @@ DEST_BUNDLE_2 = tabfern/src/view/bundle_tree.js
 .PHONY: all bundle clean
 
 all: bundle
+	./check-version.sh
 	./check-webstore.sh
 
 bundle: $(DEST_BUNDLE_1) $(DEST_BUNDLE_2)

check-version.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# check-version.sh: report version numbers in TabFern
+function check() {
+    ack_opts=( -m 1 --nocolor --nopager --output '$line_no: $line' )
+        # $filename is also available
+    echo -n "$1: "
+    ack "${ack_opts[@]}" VERSION "$1" ||
+        ack "${ack_opts[@]}" version "$1"
+}
+
+files=(package.json package-lock.json)
+
+for tree in tabfern webstore ; do
+    files+=(${tree}/manifest.json ${tree}/src/common/common.js)
+done
+
+for f in "${files[@]}" ; do
+    check "$f"
+done
+
+if [[ $1 = '-e' ]]; then
+    vi "${files[@]}"
+fi
+# vi: set ts=4 sts=4 sw=4 et ai: #

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabfern",
-  "version": "0.1.17.1337",
+  "version": "0.1.18.1337",
   "description": "Google Chrome extension for displaying, saving, and managing tabs",
   "main": "src/view/main.js",
   "directories": {

tabfern/_locales/de/messages.json

@@ -214,6 +214,10 @@
     "message": "Notiz hinzufügen oder bearbeiten"
     ,"description":"The context-menu item to add or edit a tab's note"
   }
+  , "menuAddEditNoteThisTab": {
+    "message": "Notiz für den aktuellen Tab hinzufügen oder bearbeiten"
+    ,"description":"The extension-menu item to add or edit the current tab's note"
+  }
   , "menuRename": {
     "message": "Umbenennen"
     ,"description":"The context-menu item to rename a window's tree entry"

tabfern/_locales/en/messages.json

@@ -84,6 +84,14 @@
       }
     }
   }
+  , "dlgpTextToReplace": {
+    "message": "Text to replace?  (/.../ for regex)"
+    ,"description":"Prompt for the user to enter text to replace"
+  }
+  , "dlgpReplacementText": {
+    "message": "Replacement text?"
+    ,"description":"Prompt for the user to enter text to replace"
+  }
 
   , "dlgYesHTML": {
     "message": "<span class=\"accel\">Y</span>es"
@@ -215,6 +223,10 @@
     "message": "Add/edit a note"
     ,"description":"The context-menu item to add or edit a tab's note"
   }
+  , "menuAddEditNoteThisTab": {
+    "message": "Add/edit a note for the current tab"
+    ,"description":"The extension-menu item to add or edit the current tab's note"
+  }
   , "menuRename": {
     "message": "Rename"
     ,"description":"The context-menu item to rename a window's tree entry"
@@ -243,6 +255,18 @@
     "message": "Delete"
     ,"description":"The context-menu item to delete a window or tab's tree item"
   }
+  , "menuURLSubstitute": {
+    "message": "Replace in URLs"
+    ,"description":"The context-menu item to make a replacement in the URL of each tab in the window"
+  }
+  , "menuttURLSubstitute": {
+    "message": "Make a text replacement in all of the URLs in this window"
+    ,"description":"The context-menu tooltip for menuURLSubstitute"
+  }
+  , "menuMoveToTop": {
+    "message": "Move to top"
+    ,"description":"The context-menu item to move a window's tree item to the top of the tree"
+  }
 
   , "error_text": { "message": "--------------------------------------------"
                         ,"description": "Text for error messages" }

tabfern/assets/css/icons.css

@@ -60,6 +60,10 @@
     background-image: url("/assets/icons/text_padding_top.png");
 }
 
+.jstree-themeicon-custom.arrow-switch, .vakata-context .arrow-switch {
+    background-image: url("/assets/icons/arrow_switch.png");
+}
+
 /* Class for icons with no content.  Used in jstree.set_icon() when the
  * icon is actually being set using CSS.
  */
@@ -91,12 +95,9 @@
     content: url("/assets/icons/cross.png");
 }
 
-/* Background sizes in context menu are different.  TODO fix this --- it is
- * an ugly hack. */
-.vakata-context .fff-pencil,
-.vakata-context .fff-cross,
-.vakata-context .fff-picture-delete,
-.vakata-context .fff-text-padding-top {
+/* Background sizes of icons in context menu are different.  Note: Need the
+ * `li a` to make it specific enough. */
+.vakata-context li a i {
     background-repeat: no-repeat;
     background-position: center center;
 }

tabfern/conf/require-config.js

@@ -50,10 +50,6 @@ var require = {
             exports: 'BLAKE2s'
         }
     },
-    async: {
-        useHash: true   // #callback=x rather than ?callback=x since Chrome
-                        // won't load files with ?
-    },
 };
 
 // vi: set ts=4 sts=4 sw=4 et ai fo-=o fo-=r: //

tabfern/js/asq-helpers.js

@@ -1,25 +1,15 @@
 // asq-helpers.js: Helpers for asynquence and Chrome callbacks.
 
 (function (root, factory) {
-    let imports=['asynquence-contrib'];
-
     if (typeof define === 'function' && define.amd) {
         // AMD
-        define('asq-helpers',imports, factory);
+        define('asq-helpers', ['asynquence-contrib'], factory);
     } else if (typeof exports === 'object') {
         // Node, CommonJS-like
-        let requirements = [];
-        for(let modulename of imports) {
-            requirements.push(require(modulename));
-        }
-        module.exports = factory(...requirements);
+        module.exports = factory(require('asynquence-contrib'));
     } else {
         // Browser globals (root is `window`)
-        let requirements = [];
-        for(let modulename of imports) {
-            requirements.push(root[modulename]);
-        }
-        root.ASQH = factory(...requirements);
+        root.ASQH = factory(root.ASQ);
     }
 }(this, function (ASQ) {
     "use strict";

tabfern/js/buffer.js

@@ -2121,4 +2121,4 @@ module.exports = Array.isArray || function (arr) {
 
 
 /***/ })
-/******/ ]);
+/******/ ]);

tabfern/js/export-file.js

@@ -11,10 +11,9 @@
         module.exports = factory();
     } else {
         // Browser globals (root is window)
-        root.Fileops = root.Fileops || {};
-        root.Fileops.Export = factory();
+        root.ExportFile = factory();
     }
-}(this, function ($) {
+}(this, function () {
 
     /// Save the given text to the given filename.  This is what is returned
     /// by the module loader.

tabfern/js/import-file.js

@@ -11,8 +11,7 @@
         module.exports = factory();
     } else {
         // Browser globals (root is window)
-        root.Fileops = root.Fileops || {};
-        root.Fileops.Importer = factory();
+        root.ImportFile = factory();
     }
 }(this, function () {
 

tabfern/js/jstree-multitype.js

@@ -20,7 +20,7 @@
 	else {
 		factory(jQuery, jQuery.jstree);
 	}
-}(function ($, jstree, undefined) {
+}(function ($, _jstree_unused, undefined) {
 	"use strict";
 
 	if($.jstree.plugins.multitype) { return; }

tabfern/js/jstree-redraw-event.js

@@ -24,17 +24,24 @@
 	if($.jstree.plugins.redraw_event) { return; }
 
 	$.jstree.plugins.redraw_event = function (options, parent) {
-		//this._data.redraw_event = {reason: undefined};
+		this._data.redraw_event = {suppress: false};
 
 		/// Redraw.
 		/// @param {DOM object} obj The node being redrawn
 		/// @return the object, if the parent was able to redraw it.
 		this.redraw_node = function(obj, deep, callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			this.trigger('redraw_event', {obj: obj});
+			if(!this._data.redraw_event.suppress) {
+				obj = parent.redraw_node.apply(this, arguments);
+				this.trigger('redraw_event', {obj: obj});
+			}
 			return obj;
 		}; //redraw_node
 
+		/// Suppress redraw temporarily.  EXPERIMENTAL.
+		this.suppress_redraw = function(whether_to) {
+			this._data.redraw_event.suppress = !!whether_to;
+		}
+
 	};
 }));
 

tabfern/js/justhtmlescape.js

@@ -3,7 +3,7 @@
 /// Adapted from https://github.com/janl/mustache.js/blob/master/mustache.js
 /// MIT license --- see end of file
 
-// Defines HTMLEscaper, which has escape(text) and unescape(text) functions.
+// Returns { escape(text), unescape(text) }.
 
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
@@ -14,7 +14,7 @@
         module.exports = factory();
     } else {
         // Browser globals (root is window)
-        root.HTMLEscaper = factory();
+        root.JustHTMLEscape = factory();
     }
 }(this, function () {
 

tabfern/js/spin-packed.js

@@ -292,4 +292,4 @@ function convertOffset(x, y, degrees) {
 
 
 /***/ })
-/******/ ]);
+/******/ ]);

tabfern/manifest.json

@@ -1,8 +1,8 @@
 {
   "name": "__MSG_wsLongName__",
   "short_name": "__MSG_wsShortName__",
-  "version": "0.1.17.1337",
-  "version_name": "0.1.17",
+  "version": "0.1.18.1337",
+  "version_name": "0.1.18",
   "offline_enabled": true,
   "manifest_version": 2,
   "minimum_chrome_version": "54",