diff --git a/chrome/content/scrapbook/trade.js b/chrome/content/scrapbook/trade.js index 6b00f15c..b8504601 100644 --- a/chrome/content/scrapbook/trade.js +++ b/chrome/content/scrapbook/trade.js @@ -551,8 +551,10 @@ var sbImportService = { if ( this.tarResArray[0] != window.top.sbTreeHandler.TREE.ref ) folder = " [" + item.folder + "] "; } var curRes = sbDataSource.addItem(item, this.tarResArray[0], this.tarResArray[1]); - if (item.container || item.type == "folder") sbDataSource.createEmptySeq(curRes.Value); - this.folderTable[item.title] = curRes.Value; + if (item.container || item.type == "folder") { + sbDataSource.createEmptySeq(curRes.Value); + this.folderTable[item.title] = curRes.Value; + } window.top.sbTreeHandler.TREE.builder.rebuild(); }, diff --git a/doc/releases/1.13.11.txt b/doc/releases/1.13.11.txt new file mode 100644 index 00000000..046290be --- /dev/null +++ b/doc/releases/1.13.11.txt @@ -0,0 +1,7 @@ +Scrapbook X 1.13.11 +=================== + +Changes since v1.13.10 +---------------------- + + * Fixed an issue that fulltext search does not work in Firefox >= 54. diff --git a/doc/releases/1.13.12.txt b/doc/releases/1.13.12.txt new file mode 100644 index 00000000..8d95574c --- /dev/null +++ b/doc/releases/1.13.12.txt @@ -0,0 +1,14 @@ +Scrapbook X 1.13.12 +=================== + +Changes since v1.13.11 +---------------------- + + * Fixed an issue that a file named ".foo" be fixed to "foo" and + loses its extension. + + * Persent chars ("%") in a filename are now always encoded in URL. + + * Fixed an issue that a non-folder item with a same name with a + folder before it causes the import wizard to generated a duplicated + folder. diff --git a/doc/releases/1.14.0rc10.txt b/doc/releases/1.14.0rc10.txt new file mode 100644 index 00000000..b69dc20d --- /dev/null +++ b/doc/releases/1.14.0rc10.txt @@ -0,0 +1,14 @@ +Scrapbook X 1.14.0rc10 +====================== + +Changes since v1.14.0rc9 +------------------------ + + * Fixed an issue that a file named ".foo" be fixed to "foo" and + loses its extension. + + * Persent chars ("%") in a filename are now always encoded in URL. + + * Fixed an issue that a non-folder item with a same name with a + folder before it causes the import wizard to generated a duplicated + folder. diff --git a/install.rdf b/install.rdf index c7faf599..c2239988 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ scrapbookx@addons.mozilla.org 2 - 1.14.0rc9 + 1.14.0rc10 false false false @@ -19,7 +19,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 4.0 - 54.* + 55.* diff --git a/modules/common.jsm b/modules/common.jsm index 657dddac..3cd71cd8 100644 --- a/modules/common.jsm +++ b/modules/common.jsm @@ -904,14 +904,14 @@ var sbCommonUtils = { escapeFileName: function(aString) { // " ": breaks srcset // "#": as the demarcation of main location and hash - return aString.replace(/(?:[ #]|%[0-9A-Fa-f]{2})+/g, function(m){return encodeURIComponent(m);}); + return aString.replace(/[ %#]+/g, function(m){return encodeURIComponent(m);}); }, // Tidy chars that may not be valid in a filename on a platform. // see also: escapeFileName validateFileName: function(aFileName) { aFileName = aFileName.replace(/[\x00-\x1F\x7F]+|^ +/g, ""); - aFileName = aFileName.replace(/^[. ]+/, "").replace(/[. ]+$/, ""); // leading/trailing spaces and dots are not allowed in Windows + aFileName = aFileName.replace(/^\./, "_.").replace(/^ +/, "").replace(/[. ]+$/, ""); // leading/trailing spaces and dots are not allowed in Windows aFileName = aFileName.replace(/[\"\?\*\\\/\|\:]/g, "_"); aFileName = aFileName.replace(/[\<]/g, "("); aFileName = aFileName.replace(/[\>]/g, ")");