Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added text subtype "tr" (text rich) to formula1.js and socialcalc3.js

Updated license copyright years.

Signed-off-by: DanBricklin <danb@bricklin.com>
  • Loading branch information...
commit cc455efaed148438bfe4f14f8d9cd6a098a59b49 1 parent f22732c
@DanBricklin authored
View
3  Changes.txt
@@ -604,6 +604,9 @@ Changed cursor position detection a bit in color chooser.
Made border color chooser moveable.
Fixed "-", ".", "e1" and other things being considered a number on input.
+2009-10-21:
+Added text subtype "tr" (text rich) to formula1.js TypeLookupTable and to socialcalc3.js format_text_for_display
+
TO DO:
View
2  LEGAL.txt
@@ -9,7 +9,7 @@ licenses as well as general legal notices.
COPYRIGHT AND ATTRIBUTION NOTICES
=========================================
-Copyright (C) 2008 Socialtext, Inc.
+Copyright (C) 2009 Socialtext, Inc.
All Rights Reserved.
image:sc-logo.gif
View
2  LICENSE.txt
@@ -478,7 +478,7 @@ need not be linked to the Attribution URL but the "tool-tip" is still required.
Attribution Copyright Notice:
- Copyright (C) 2008 Socialtext, Inc.
+ Copyright (C) 2009 Socialtext, Inc.
All Rights Reserved.
Attribution Phrase (not exceeding 10 words): SocialCalc
View
9 formula1.js
@@ -115,10 +115,11 @@ SocialCalc.Formula = {};
'e*': '|e*:1|n*:1|t*:1|b:1|'
},
concat: {
- 't': '|t:t|th:th|tw:tw|tl:t|t*:2|e*:2|',
- 'th': '|t:th|th:th|tw:t|tl:th|t*:t|e*:2|',
- 'tw': '|t:tw|th:t|tw:tw|tl:tw|t*:t|e*:2|',
- 'tl': '|t:tl|th:th|tw:tw|tl:tl|t*:t|e*:2|',
+ 't': '|t:t|th:th|tw:tw|tl:t|tr:tr|t*:2|e*:2|',
+ 'th': '|t:th|th:th|tw:t|tl:th|tr:t|t*:t|e*:2|',
+ 'tw': '|t:tw|th:t|tw:tw|tl:tw|tr:tw|t*:t|e*:2|',
+ 'tl': '|t:tl|th:th|tw:tw|tl:tl|tr:tr|t*:t|e*:2|',
+ 't*': '|t*:t|e*:2|',
'e*': '|e*:1|n*:1|t*:1|'
},
oneargnumeric: { 'n*': '|n*:n|', 'e*': '|e*:1|', 't*': '|t*:e#VALUE!|', 'b': '|b:n|'},
View
2  socialcalc-3.js
@@ -4975,7 +4975,7 @@ SocialCalc.format_text_for_display = function(rawvalue, valuetype, valueformat,
if (!/^(text-|custom|hidden)/.test(valueformat)) valueformat="";
if (valueformat=="" || valueformat=="General") { // determine format from type
if (valuesubtype=="h") valueformat="text-html";
- if (valuesubtype=="w") valueformat="text-wiki";
+ if (valuesubtype=="w" || valuesubtype=="r") valueformat="text-wiki";
if (valuesubtype=="l") valueformat="text-link";
if (!valuesubtype) valueformat="text-plain";
}
Please sign in to comment.
Something went wrong with that request. Please try again.