OSDN > ソフトウェアを探す > Javascript Micro Libraries > SCM > hg > micro-format > コミット

Javascript Micro Libraries
Fork
micro-formelements
jxunit
micro-namespace
cookie-recipe
micro-suggest
micro-check
micro-format
micro-keyboard
micro-radar
micro-calendar
micro-dialog

micro-format: コミット

string substitution and template library

merge feature/opener

diff -r 21bf5af5cdf3 -r 900200da2721 .hgignore

--- a/.hgignore Thu Apr 05 19:12:31 2018 +0900

+++ b/.hgignore Wed Aug 07 17:04:03 2019 +0900

diff -r 21bf5af5cdf3 -r 900200da2721 src/microformat.js

--- a/src/microformat.js Thu Apr 05 19:12:31 2018 +0900

+++ b/src/microformat.js Wed Aug 07 17:04:03 2019 +0900

		@@ -123,6 +141,11 @@
123	141	return result;
124	142	};
125	143
	144	+ var escapeExpression = function(string) {
	145	+ // $& means the whole matched string
	146	+ return string.replace(/[.*+?^${}()\|[\]\\]/g, '\\$&');
	147	+ };
	148	+
126	149	/**
127	150	*
128	151	* @param {Object} settings

		@@ -1214,7 +1237,15 @@
1214	1237	// useExplicitArrays = value === true;
1215	1238	//});
1216	1239
1217		- format.VERSION = "0.2.1";
	1240	+ format.setOpener = function(left){
	1241	+ opener = escapeExpression(left);
	1242	+ };
	1243	+
	1244	+ format.setCloser = function(right){
	1245	+ closer = escapeExpression(right);
	1246	+ };
	1247	+
	1248	+ format.VERSION = "0.2.2";
1218	1249
1219	1250	return format;
1220	1251

diff -r 21bf5af5cdf3 -r 900200da2721 test/microformat.test.js

--- a/test/microformat.test.js Thu Apr 05 19:12:31 2018 +0900

+++ b/test/microformat.test.js Wed Aug 07 17:04:03 2019 +0900

		@@ -298,6 +298,40 @@
298	298
299	299	},
300	300
	301	+ testChangeOpenerParentheesis: function(){
	302	+ format.setOpener("((");
	303	+ format.setCloser("))");
	304	+
	305	+ var formatString = "{{ who }} is {{ what }} (( who )) is (( what )).";
	306	+
	307	+ var param = {
	308	+ who :"MR. BIG",
	309	+ what :"small",
	310	+ };
	311	+
	312	+ var expected = "{{ who }} is {{ what }} " + param.who + " is " + param.what + ".",
	313	+ actual = format(formatString, param);
	314	+
	315	+ assertEqual(expected, actual);
	316	+ },
	317	+
	318	+ testChangeOpenerBracket: function(){
	319	+ format.setOpener("[[");
	320	+ format.setCloser("]]");
	321	+
	322	+ var formatString = "{{ who }} is {{ what }} [[ who \| toUpperCase ]] is [[ what \| toLowerCase ]].";
	323	+
	324	+ var param = {
	325	+ who :"mr. big",
	326	+ what :"SMALL",
	327	+ };
	328	+
	329	+ var expected = "{{ who }} is {{ what }} " + param.who.toUpperCase() + " is " + param.what.toLowerCase() + ".",
	330	+ actual = format(formatString, param);
	331	+
	332	+ assertEqual(expected, actual);
	333	+ },
	334	+
301	335	testAdditionalFilter :function(){
302	336	var myCondFilter = function(s){
303	337	var f = parseFloat(s);