Merge branch 'hotfix-1.13.5'

* hotfix-1.13.5: Update version info. output: fix bad code intents in output index.html doc: revise release notes output: fix search page not loading custom.js doc: revise release notes
danny0838 · Jan 6, 2017 · de94c27 · de94c27
2 parents 49d0ebc + e501767
commit de94c27
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 13 deletions.
diff --git a/chrome/content/scrapbook/output.js b/chrome/content/scrapbook/output.js
@@ -137,7 +137,7 @@ var sbOutputService = {
             + '    toggleAll(false);\n'
             + '    try {\n'
             + '        initLoadHash();\n'
-            + '    } catch(ex) {'
+            + '    } catch(ex) {\n'
             + '        if (console && console.error) console.error(ex);\n'
             + '    }\n'
             + '    initEvents();\n'
@@ -203,7 +203,7 @@ var sbOutputService = {
             + '        if (history && history.pushState) top.history.pushState("", title, hash);\n'
             + '        else top.location.hash = hash;\n'
             + '        top.document.title = title;\n'
-            + '    } catch(ex) {'
+            + '    } catch(ex) {\n'
             + '        if (console && console.error) console.error(ex);\n'
             + '    }\n'
             + '}\n'
@@ -834,6 +834,7 @@ var sbOutputService = {
             + '    }\n'
             + '};\n'
             + '</script>\n'
+            + '<script src="tree/custom.js"></script>\n'
             + '</head>\n'
             + '<body onload="searchEngine.init();">\n'
             + '<form action="javascript:searchEngine.search();">\n'

diff --git a/doc/releases/1.13.0.txt b/doc/releases/1.13.0.txt
@@ -51,7 +51,8 @@ Compatibility notes (with 1.12.*)
  * Language packs are largely modified.
 
    One thing has to be explicitly noted is that "capture" has been renamed
-   to "save", as legacy ScrapBook by Gomita has done.  Additionally, previous "Localize Embedded External Media" has been simplified to 
+   to "save", as legacy ScrapBook by Gomita has done.  Additionally,
+   previous "Localize Embedded External Media" has been simplified to
    "Internalize".  Some documentation may need to be updated accordingly.
 
 
@@ -104,9 +105,9 @@ Bug fixes:
 
  * A page linked from an XHTML page and has a path containing certain
    special characters (such as "!", "'", or "~") causes some interlinks be
-   not builded.
+   not built.
 
- * Certain styles and scripts become broken when a XHTML page is saved
+ * Certain styles and scripts become broken when an XHTML page is saved
    as HTML via "Save presenting HTML for non-HTML files".
 
  * Some editor functions, such as DOM Erasor and Freenote, do not work for
@@ -231,7 +232,7 @@ Save functionality:
 
    * Added a context menu with "check/uncheck selected items" directives.
 
-   * An invalid RegExp is now forbidden in to prevent an error on
+   * An invalid RegExp is now forbidden from input to prevent an error on
      filtering URLs.
 
  * Added save option "Save data URI as file".
@@ -291,7 +292,7 @@ Save functionality:
    If the provided string is invalid, it will be ignored and the error
    will be output to the browser console for trouble shooting.
 
- * New user preferences to determine certain details to record.
+ * New user preferences to determine certain details to be recorded.
 
    "save.default.recordSkippedUrl", "save.default.recordRemovedAttr", and
    "save.default.recordInDepthLink" user preferences are now available to
@@ -412,7 +413,7 @@ Data tree, sidebar, and manager:
 
 Hotkey:
 
- * Improved cross platform hotkey support.
+ * Improved cross-platform hotkey support.
 
    Now supports the command key and the hotkey presentation style for
    Macs.  Also added the support for customized accel key via the user

diff --git a/doc/releases/1.13.0b12.txt b/doc/releases/1.13.0b12.txt
@@ -53,7 +53,7 @@ Core changes:
    For instance, they generate problematic CSS, they don't support
    querySelector and cannot tidy captured CSS or resolve internal hash
    links, they cannot modify getters for prototypes and cannot work
-   with our cross platform keyboard shortcut framework, they support
+   with our cross-platform keyboard shortcut framework, they support
    HTML5 poorly and must use the ancient nsDragAndDrop API to support
    drag and drop, which is buggy in many cases.
 

diff --git a/doc/releases/1.13.0b15.txt b/doc/releases/1.13.0b15.txt
@@ -26,9 +26,9 @@ Bug fixes:
 
  * A page linked from an XHTML page and has a path containing certain
    special characters (such as "!", "'", or "~") causes some interlinks be
-   not builded.
+   not built.
 
- * Certain styles and scripts become broken when a XHTML page is captured
+ * Certain styles and scripts become broken when an XHTML page is captured
    as HTML via "Capture presenting HTML for non-HTML files".
 
  * Some editor functions, such as DOM Erasor and Freenote, does not work

diff --git a/doc/releases/1.13.0b8.txt b/doc/releases/1.13.0b8.txt
@@ -25,7 +25,7 @@ Bug fixes:
 
 Functionality changes:
 
- * Improved cross platform hotkey support, especially the support for
+ * Improved cross-platform hotkey support, especially the support for
    the command key and the hotkey presentation style for Macs.
 
  * Allows customized hotkey combination in the user options.

diff --git a/doc/releases/1.13.5.txt b/doc/releases/1.13.5.txt
@@ -0,0 +1,12 @@
+Scrapbook X 1.13.5
+==================
+
+Changes since v1.13.4
+---------------------
+
+ * Fixed a regression that the search page of "Output HTML tree" does
+   not load "custom.js" in the "tree" folder.
+
+ * Improved the output code of the index page of "Output HTML tree".
+
+Also includes some documentation improvements.
diff --git a/install.rdf b/install.rdf
@@ -6,7 +6,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>[email protected]</em:id>
         <em:type>2</em:type>
-        <em:version>1.13.4</em:version>
+        <em:version>1.13.5</em:version>
         <em:unpack>false</em:unpack>
         <em:bootstrap>false</em:bootstrap>
         <em:multiprocessCompatible>false</em:multiprocessCompatible>