Commit ddc7e41

committed

Revert the merge because it introduced some unexpected bugs. Revisit later

1 parent 121a508 commit ddc7e41Copy full SHA for ddc7e41

File tree

3 files changed

-37

lines changed

st.js
test
- integration
  - index.html
- unit
  - exception.js

3 files changed

-37

lines changed

`‎st.js‎`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`(function() {`
`2`	`2`	`var $context = this;`
`3`	`3`	`var root; // root context`
`4`		`- var _stringify;`
`5`	`4`	`var Helper = {`
`6`	`5`	`is_template: function(str) {`
`7`	`6`	`var re = /\{\{(.+)\}\}/g;`
`@@ -671,7 +670,6 @@`
`671`	`670`	`},`
`672`	`671`	`// returns the object itself`
`673`	`672`	`select: function(obj, filter, serialized) {`
`674`		`- JSON.stringify = overriddenStringify;`
`675`	`673`	`// iterate '$selected'`
`676`	`674`	`//`
`677`	`675`	`/*`
`@@ -843,7 +841,6 @@`
`843`	`841`
`844`	`842`	`// Terminal methods`
`845`	`843`	`objects: function() {`
`846`		`- JSON.stringify = _stringify;`
`847`	`844`	`SELECT.$progress = null;`
`848`	`845`	`if (SELECT.$selected) {`
`849`	`846`	`return SELECT.$selected.map(function(item) { return item.object; });`
`@@ -852,7 +849,6 @@`
`852`	`849`	`}`
`853`	`850`	`},`
`854`	`851`	`keys: function() {`
`855`		`- JSON.stringify = _stringify;`
`856`	`852`	`SELECT.$progress = null;`
`857`	`853`	`if (SELECT.$selected) {`
`858`	`854`	`return SELECT.$selected.map(function(item) { return item.key; });`
`@@ -865,7 +861,6 @@`
`865`	`861`	`}`
`866`	`862`	`},`
`867`	`863`	`paths: function() {`
`868`		`- JSON.stringify = _stringify;`
`869`	`864`	`SELECT.$progress = null;`
`870`	`865`	`if (SELECT.$selected) {`
`871`	`866`	`return SELECT.$selected.map(function(item) { return item.path; });`
`@@ -884,7 +879,6 @@`
`884`	`879`	`}`
`885`	`880`	`},`
`886`	`881`	`values: function() {`
`887`		`- JSON.stringify = _stringify;`
`888`	`882`	`SELECT.$progress = null;`
`889`	`883`	`if (SELECT.$selected) {`
`890`	`884`	`return SELECT.$selected.map(function(item) { return item.value; });`
`@@ -893,15 +887,14 @@`
`893`	`887`	`}`
`894`	`888`	`},`
`895`	`889`	`root: function() {`
`896`		`- JSON.stringify = _stringify;`
`897`	`890`	`SELECT.$progress = null;`
`898`	`891`	`return SELECT.$selected_root;`
`899`	`892`	`},`
`900`	`893`	`};`
`901`	`894`
`902`	`895`	`// Native JSON object override`
`903`		`- _stringify = JSON.stringify;`
`904`		`- varoverriddenStringify = function(val, replacer, spaces) {`
	`896`	`+ var_stringify = JSON.stringify;`
	`897`	`+ JSON.stringify = function(val, replacer, spaces) {`
`905`	`898`	`var t = typeof val;`
`906`	`899`	`if (['number', 'string', 'boolean'].indexOf(t) !== -1) {`
`907`	`900`	`return _stringify(val, replacer, spaces);`

`‎test/integration/index.html‎`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,5 @@`
`34`	`34`	`}`
`35`	`35`	`}, data);`
`36`	`36`
`37`		`-var sample_json = JSON.stringify({`
`38`		`- "key": "{{this}}"`
`39`		`-})`
`40`		`-console.log("stringified = ", sample_json)`
`41`		`-`
`42`	`37`	`</script>`
`43`	`38`	`</html>`

`‎test/unit/exception.js‎`

Lines changed: 0 additions & 23 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ddc7e41

File tree

3 files changed

3 files changed

`‎st.js‎`

`‎test/integration/index.html‎`

`‎test/unit/exception.js‎`

0 commit comments