Ticket #766: ticket766.patch

core/js/TiddlyWiki.js

@@ -151 +151 @@
         return textOut.join("");
 };
 
-TiddlyWiki.prototype.slicesRE = /(?:^([\'\/]{0,2})~?([\.\w]+)\:\1\s*([^\n]+)\s*$)|(?:^\|([\'\/]{0,2})~?([\.\w]+)\:?\4\|\s*([^\|\n]+)\s*\|$)/gm;
+TiddlyWiki.prototype.slicesRE = /(?:^([\'\/]{0,2})~?([\.\w]+)\:\1[\t\x20]*([^\n]+)[\t\x20]*$)|(?:^\|([\'\/]{0,2})~?([\.\w]+)\:?\4\|[\t\x20]*([^\n]+)[\t\x20]*\|$)/gm;
 
 // @internal
 TiddlyWiki.prototype.calcAllSlices = function(title)

core/tests/jsspec/TiddlyWiki.jsspec.js

@@ -172 +172 @@
                 value_of(actual).should_be(expected);
         },
 
-
         'should ignore colons in slice values (colon notation)': function() {
                 var title = "tiddler";
                 var text = "foo: bar: baz";
@@ -197 +196 @@
                 var expected = { "foo": "bar|baz" };
                 value_of(actual).should_be(expected);
         },
-        /*'should ignore additional columns (table notation)': function() {
+        'should allow pipes in slice values (table notation)': function() {
                 var title = "tiddler";
                 var text = "|foo|bar|baz|";
                 store.saveTiddler(title, title, text);
                 var actual = store.calcAllSlices(title);
-                var expected = { foo: "bar" };
+                var expected = { "foo": "bar|baz" };
                 value_of(actual).should_be(expected);
-        },*/
+        },
 
         'should retrieve slices containing PrettyLinks (colon notation)': function() {
                 var title = "tiddler";