From 042048657a5691fb81bc17fa9aa084896c2d6e9b Mon Sep 17 00:00:00 2001 From: leeluolee <87399126@163.com> Date: Thu, 29 Jan 2015 23:17:45 +0800 Subject: [PATCH 1/2] change inejct --- src/Regular.js | 2 +- test/spec/test-lexer.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Regular.js b/src/Regular.js index 24cf703..7ca769a 100644 --- a/src/Regular.js +++ b/src/Regular.js @@ -491,7 +491,7 @@ Regular.implement({ Regular.prototype.inject = function(){ _.log("use $inject instead of inject", "error"); - this.$inejct.apply(this, arguments); + this.$inject.apply(this, arguments); } diff --git a/test/spec/test-lexer.js b/test/spec/test-lexer.js index b5f553a..2dc2db3 100644 --- a/test/spec/test-lexer.js +++ b/test/spec/test-lexer.js @@ -1,4 +1,5 @@ var Lexer = require_lib("parser/Lexer.js"); +var config = require_lib("config.js"); /** * setup template @@ -67,6 +68,12 @@ describe("Lexer under mode 1 and 2", function(){ }) + it("config should work", function(){ + config.END = "}}"; + config.BEGIN = "{{"; + + }) + }) From 5751363fdd3023a72faaaf4eddf30e4d8882ea04 Mon Sep 17 00:00:00 2001 From: ZhengHaibo <87399126@163.com> Date: Fri, 13 Feb 2015 10:51:48 +0800 Subject: [PATCH 2/2] Change MIT remove leeluolee and and Netease & other partner . beacuse I develop it in my working time --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3724b8a..4597c40 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (c) 2012-2014 zheng haibo(leeluolee). and regular contributors +Copyright (c) 2012-2015 NetEase, Inc. and regularjs contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the