diff --git a/.gitattributes b/.gitattributes index 391f0a4e4..724b13111 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ * text=auto *.js text eol=lf +*.jst text eol=lf +*.sh text eol=lf +*.tpl text eol=lf diff --git a/test/test-build.js b/test/test-build.js index 390b42313..939f237af 100644 --- a/test/test-build.js +++ b/test/test-build.js @@ -582,9 +582,12 @@ context._ = _; vm.runInContext(data.source, context); - equal(_.templates.a(object.a).replace(/[\r\n]+/g, ''), '', basename); + var actual = _.templates.a(object.a); + equal(actual.replace(/[\r\n]+/g, ''), '', basename); + equal(_.templates.b(object.b), 'Hello stooge.', basename); equal(_.templates.c(object.c), 'Hello ES6!', basename); + delete _.templates; start(); }); @@ -617,7 +620,9 @@ equal(moduleId, expectedId, basename); ok('a' in _.templates && 'b' in _.templates, basename); - equal(_.templates.a({ 'people': ['moe', 'larry'] }), '', basename); + + var actual = _.templates.a({ 'people': ['moe', 'larry'] }); + equal(actual.replace(/[\r\n]+/g, ''), '', basename); delete _.templates; start(); diff --git a/vendor/firebug-lite/license.txt b/vendor/firebug-lite/license.txt old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/blank.gif b/vendor/firebug-lite/skin/xp/blank.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/buttonBg.png b/vendor/firebug-lite/skin/xp/buttonBg.png old mode 100644 new mode 100755 index 3235b42f0..f367b427e Binary files a/vendor/firebug-lite/skin/xp/buttonBg.png and b/vendor/firebug-lite/skin/xp/buttonBg.png differ diff --git a/vendor/firebug-lite/skin/xp/buttonBgHover.png b/vendor/firebug-lite/skin/xp/buttonBgHover.png old mode 100644 new mode 100755 index 007e085de..cd37a0d52 Binary files a/vendor/firebug-lite/skin/xp/buttonBgHover.png and b/vendor/firebug-lite/skin/xp/buttonBgHover.png differ diff --git a/vendor/firebug-lite/skin/xp/debugger.css b/vendor/firebug-lite/skin/xp/debugger.css old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/detach.png b/vendor/firebug-lite/skin/xp/detach.png old mode 100644 new mode 100755 index c73a03571..0ddb9a176 Binary files a/vendor/firebug-lite/skin/xp/detach.png and b/vendor/firebug-lite/skin/xp/detach.png differ diff --git a/vendor/firebug-lite/skin/xp/detachHover.png b/vendor/firebug-lite/skin/xp/detachHover.png old mode 100644 new mode 100755 index f5abc76d2..e41927291 Binary files a/vendor/firebug-lite/skin/xp/detachHover.png and b/vendor/firebug-lite/skin/xp/detachHover.png differ diff --git a/vendor/firebug-lite/skin/xp/disable.gif b/vendor/firebug-lite/skin/xp/disable.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/disable.png b/vendor/firebug-lite/skin/xp/disable.png old mode 100644 new mode 100755 index 8f9396bc8..c28bcdf24 Binary files a/vendor/firebug-lite/skin/xp/disable.png and b/vendor/firebug-lite/skin/xp/disable.png differ diff --git a/vendor/firebug-lite/skin/xp/disableHover.gif b/vendor/firebug-lite/skin/xp/disableHover.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/disableHover.png b/vendor/firebug-lite/skin/xp/disableHover.png old mode 100644 new mode 100755 index b4767e1c8..26fe37542 Binary files a/vendor/firebug-lite/skin/xp/disableHover.png and b/vendor/firebug-lite/skin/xp/disableHover.png differ diff --git a/vendor/firebug-lite/skin/xp/down.png b/vendor/firebug-lite/skin/xp/down.png old mode 100644 new mode 100755 index d4bec5ace..acbbd30c0 Binary files a/vendor/firebug-lite/skin/xp/down.png and b/vendor/firebug-lite/skin/xp/down.png differ diff --git a/vendor/firebug-lite/skin/xp/downActive.png b/vendor/firebug-lite/skin/xp/downActive.png old mode 100644 new mode 100755 index 9c3c72b3c..f4312b2ff Binary files a/vendor/firebug-lite/skin/xp/downActive.png and b/vendor/firebug-lite/skin/xp/downActive.png differ diff --git a/vendor/firebug-lite/skin/xp/downHover.png b/vendor/firebug-lite/skin/xp/downHover.png old mode 100644 new mode 100755 index 510ba6562..8144e6378 Binary files a/vendor/firebug-lite/skin/xp/downHover.png and b/vendor/firebug-lite/skin/xp/downHover.png differ diff --git a/vendor/firebug-lite/skin/xp/errorIcon-sm.png b/vendor/firebug-lite/skin/xp/errorIcon-sm.png old mode 100644 new mode 100755 index e17b9f143..0c377e307 Binary files a/vendor/firebug-lite/skin/xp/errorIcon-sm.png and b/vendor/firebug-lite/skin/xp/errorIcon-sm.png differ diff --git a/vendor/firebug-lite/skin/xp/errorIcon.gif b/vendor/firebug-lite/skin/xp/errorIcon.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/errorIcon.png b/vendor/firebug-lite/skin/xp/errorIcon.png old mode 100644 new mode 100755 index 049e4fb36..2d75261bb Binary files a/vendor/firebug-lite/skin/xp/errorIcon.png and b/vendor/firebug-lite/skin/xp/errorIcon.png differ diff --git a/vendor/firebug-lite/skin/xp/firebug-1.3a2.css b/vendor/firebug-lite/skin/xp/firebug-1.3a2.css old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/firebug.IE6.css b/vendor/firebug-lite/skin/xp/firebug.IE6.css old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/firebug.css b/vendor/firebug-lite/skin/xp/firebug.css old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/firebug.html b/vendor/firebug-lite/skin/xp/firebug.html old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/firebug.png b/vendor/firebug-lite/skin/xp/firebug.png old mode 100644 new mode 100755 index aa629f451..e10affebb Binary files a/vendor/firebug-lite/skin/xp/firebug.png and b/vendor/firebug-lite/skin/xp/firebug.png differ diff --git a/vendor/firebug-lite/skin/xp/group.gif b/vendor/firebug-lite/skin/xp/group.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/html.css b/vendor/firebug-lite/skin/xp/html.css old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/infoIcon.gif b/vendor/firebug-lite/skin/xp/infoIcon.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/infoIcon.png b/vendor/firebug-lite/skin/xp/infoIcon.png old mode 100644 new mode 100755 index e229c9c2c..da1e5334c Binary files a/vendor/firebug-lite/skin/xp/infoIcon.png and b/vendor/firebug-lite/skin/xp/infoIcon.png differ diff --git a/vendor/firebug-lite/skin/xp/loading_16.gif b/vendor/firebug-lite/skin/xp/loading_16.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/min.png b/vendor/firebug-lite/skin/xp/min.png old mode 100644 new mode 100755 index 55de414f4..1034d66fb Binary files a/vendor/firebug-lite/skin/xp/min.png and b/vendor/firebug-lite/skin/xp/min.png differ diff --git a/vendor/firebug-lite/skin/xp/minHover.png b/vendor/firebug-lite/skin/xp/minHover.png old mode 100644 new mode 100755 index dbf226f75..b0d1e1afd Binary files a/vendor/firebug-lite/skin/xp/minHover.png and b/vendor/firebug-lite/skin/xp/minHover.png differ diff --git a/vendor/firebug-lite/skin/xp/off.png b/vendor/firebug-lite/skin/xp/off.png old mode 100644 new mode 100755 index 4a6cb4159..b70b1d24d Binary files a/vendor/firebug-lite/skin/xp/off.png and b/vendor/firebug-lite/skin/xp/off.png differ diff --git a/vendor/firebug-lite/skin/xp/offHover.png b/vendor/firebug-lite/skin/xp/offHover.png old mode 100644 new mode 100755 index 4eb03a6fb..f3670f19f Binary files a/vendor/firebug-lite/skin/xp/offHover.png and b/vendor/firebug-lite/skin/xp/offHover.png differ diff --git a/vendor/firebug-lite/skin/xp/pixel_transparent.gif b/vendor/firebug-lite/skin/xp/pixel_transparent.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/roundCorner.svg b/vendor/firebug-lite/skin/xp/roundCorner.svg old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/search.gif b/vendor/firebug-lite/skin/xp/search.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/search.png b/vendor/firebug-lite/skin/xp/search.png old mode 100644 new mode 100755 index 967c3b2cf..fba33b8a5 Binary files a/vendor/firebug-lite/skin/xp/search.png and b/vendor/firebug-lite/skin/xp/search.png differ diff --git a/vendor/firebug-lite/skin/xp/shadow.gif b/vendor/firebug-lite/skin/xp/shadow.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/shadow2.gif b/vendor/firebug-lite/skin/xp/shadow2.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/shadowAlpha.png b/vendor/firebug-lite/skin/xp/shadowAlpha.png old mode 100644 new mode 100755 index f61e1be4f..a2561df97 Binary files a/vendor/firebug-lite/skin/xp/shadowAlpha.png and b/vendor/firebug-lite/skin/xp/shadowAlpha.png differ diff --git a/vendor/firebug-lite/skin/xp/sprite.png b/vendor/firebug-lite/skin/xp/sprite.png old mode 100644 new mode 100755 index fa63b9dc9..33d2c4d46 Binary files a/vendor/firebug-lite/skin/xp/sprite.png and b/vendor/firebug-lite/skin/xp/sprite.png differ diff --git a/vendor/firebug-lite/skin/xp/tabHoverLeft.png b/vendor/firebug-lite/skin/xp/tabHoverLeft.png old mode 100644 new mode 100755 index e6403422b..0fb24d0c8 Binary files a/vendor/firebug-lite/skin/xp/tabHoverLeft.png and b/vendor/firebug-lite/skin/xp/tabHoverLeft.png differ diff --git a/vendor/firebug-lite/skin/xp/tabHoverMid.png b/vendor/firebug-lite/skin/xp/tabHoverMid.png old mode 100644 new mode 100755 index 1e6f583bc..fbccab54d Binary files a/vendor/firebug-lite/skin/xp/tabHoverMid.png and b/vendor/firebug-lite/skin/xp/tabHoverMid.png differ diff --git a/vendor/firebug-lite/skin/xp/tabHoverRight.png b/vendor/firebug-lite/skin/xp/tabHoverRight.png old mode 100644 new mode 100755 index 70695bd41..3db0f3617 Binary files a/vendor/firebug-lite/skin/xp/tabHoverRight.png and b/vendor/firebug-lite/skin/xp/tabHoverRight.png differ diff --git a/vendor/firebug-lite/skin/xp/tabLeft.png b/vendor/firebug-lite/skin/xp/tabLeft.png old mode 100644 new mode 100755 index 907efd778..a6cc9e94a Binary files a/vendor/firebug-lite/skin/xp/tabLeft.png and b/vendor/firebug-lite/skin/xp/tabLeft.png differ diff --git a/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png b/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png old mode 100644 new mode 100755 index 1934ee975..4726e6220 Binary files a/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png and b/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png differ diff --git a/vendor/firebug-lite/skin/xp/tabMenuPin.png b/vendor/firebug-lite/skin/xp/tabMenuPin.png old mode 100644 new mode 100755 index 85015f034..eb4b11efe Binary files a/vendor/firebug-lite/skin/xp/tabMenuPin.png and b/vendor/firebug-lite/skin/xp/tabMenuPin.png differ diff --git a/vendor/firebug-lite/skin/xp/tabMenuRadio.png b/vendor/firebug-lite/skin/xp/tabMenuRadio.png old mode 100644 new mode 100755 index b21ff3bd7..55b982d7c Binary files a/vendor/firebug-lite/skin/xp/tabMenuRadio.png and b/vendor/firebug-lite/skin/xp/tabMenuRadio.png differ diff --git a/vendor/firebug-lite/skin/xp/tabMenuTarget.png b/vendor/firebug-lite/skin/xp/tabMenuTarget.png old mode 100644 new mode 100755 index 1ec69f155..957bd9f2a Binary files a/vendor/firebug-lite/skin/xp/tabMenuTarget.png and b/vendor/firebug-lite/skin/xp/tabMenuTarget.png differ diff --git a/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png b/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png old mode 100644 new mode 100755 index 165ac873b..200a37083 Binary files a/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png and b/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png differ diff --git a/vendor/firebug-lite/skin/xp/tabMid.png b/vendor/firebug-lite/skin/xp/tabMid.png old mode 100644 new mode 100755 index eea941087..68986c3b0 Binary files a/vendor/firebug-lite/skin/xp/tabMid.png and b/vendor/firebug-lite/skin/xp/tabMid.png differ diff --git a/vendor/firebug-lite/skin/xp/tabRight.png b/vendor/firebug-lite/skin/xp/tabRight.png old mode 100644 new mode 100755 index 3148d816b..501130796 Binary files a/vendor/firebug-lite/skin/xp/tabRight.png and b/vendor/firebug-lite/skin/xp/tabRight.png differ diff --git a/vendor/firebug-lite/skin/xp/textEditorBorders.gif b/vendor/firebug-lite/skin/xp/textEditorBorders.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/textEditorBorders.png b/vendor/firebug-lite/skin/xp/textEditorBorders.png old mode 100644 new mode 100755 index 62c25835b..21682c3dc Binary files a/vendor/firebug-lite/skin/xp/textEditorBorders.png and b/vendor/firebug-lite/skin/xp/textEditorBorders.png differ diff --git a/vendor/firebug-lite/skin/xp/textEditorCorners.gif b/vendor/firebug-lite/skin/xp/textEditorCorners.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/textEditorCorners.png b/vendor/firebug-lite/skin/xp/textEditorCorners.png old mode 100644 new mode 100755 index 8f976a3a7..a0f839dc5 Binary files a/vendor/firebug-lite/skin/xp/textEditorCorners.png and b/vendor/firebug-lite/skin/xp/textEditorCorners.png differ diff --git a/vendor/firebug-lite/skin/xp/titlebarMid.png b/vendor/firebug-lite/skin/xp/titlebarMid.png old mode 100644 new mode 100755 index f62b5258e..10998ae7b Binary files a/vendor/firebug-lite/skin/xp/titlebarMid.png and b/vendor/firebug-lite/skin/xp/titlebarMid.png differ diff --git a/vendor/firebug-lite/skin/xp/toolbarMid.png b/vendor/firebug-lite/skin/xp/toolbarMid.png old mode 100644 new mode 100755 index 371c043e4..aa21dee6a Binary files a/vendor/firebug-lite/skin/xp/toolbarMid.png and b/vendor/firebug-lite/skin/xp/toolbarMid.png differ diff --git a/vendor/firebug-lite/skin/xp/tree_close.gif b/vendor/firebug-lite/skin/xp/tree_close.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/tree_open.gif b/vendor/firebug-lite/skin/xp/tree_open.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/twistyClosed.png b/vendor/firebug-lite/skin/xp/twistyClosed.png old mode 100644 new mode 100755 index 805754c2d..f80319b0a Binary files a/vendor/firebug-lite/skin/xp/twistyClosed.png and b/vendor/firebug-lite/skin/xp/twistyClosed.png differ diff --git a/vendor/firebug-lite/skin/xp/twistyOpen.png b/vendor/firebug-lite/skin/xp/twistyOpen.png old mode 100644 new mode 100755 index 653031d89..868012434 Binary files a/vendor/firebug-lite/skin/xp/twistyOpen.png and b/vendor/firebug-lite/skin/xp/twistyOpen.png differ diff --git a/vendor/firebug-lite/skin/xp/up.png b/vendor/firebug-lite/skin/xp/up.png old mode 100644 new mode 100755 index 9d0b5ac99..2174d03a9 Binary files a/vendor/firebug-lite/skin/xp/up.png and b/vendor/firebug-lite/skin/xp/up.png differ diff --git a/vendor/firebug-lite/skin/xp/upActive.png b/vendor/firebug-lite/skin/xp/upActive.png old mode 100644 new mode 100755 index 32021f4c1..236cf6768 Binary files a/vendor/firebug-lite/skin/xp/upActive.png and b/vendor/firebug-lite/skin/xp/upActive.png differ diff --git a/vendor/firebug-lite/skin/xp/upHover.png b/vendor/firebug-lite/skin/xp/upHover.png old mode 100644 new mode 100755 index 35f4e708d..cd8131707 Binary files a/vendor/firebug-lite/skin/xp/upHover.png and b/vendor/firebug-lite/skin/xp/upHover.png differ diff --git a/vendor/firebug-lite/skin/xp/warningIcon.gif b/vendor/firebug-lite/skin/xp/warningIcon.gif old mode 100644 new mode 100755 diff --git a/vendor/firebug-lite/skin/xp/warningIcon.png b/vendor/firebug-lite/skin/xp/warningIcon.png old mode 100644 new mode 100755 index 71b049d62..de51084e8 Binary files a/vendor/firebug-lite/skin/xp/warningIcon.png and b/vendor/firebug-lite/skin/xp/warningIcon.png differ diff --git a/vendor/firebug-lite/src/firebug-lite-debug.js b/vendor/firebug-lite/src/firebug-lite-debug.js old mode 100644 new mode 100755