change .initAttrs agrument #40

aralejs · May 8, 2013 · 0f4cae7 · 0f4cae7
1 parent f8f33a8
commit 0f4cae7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "alias": {
       "$": "$",
       "handlebars": "gallery/handlebars/1.0.1/handlebars",
-      "base": "arale/base/1.0.1/base"
+      "base": "arale/base/1.1.0/base"
     },
     "output": ["widget.js", "templatable.js"]
   }

diff --git a/src/widget.js b/src/widget.js
@@ -59,7 +59,7 @@ define(function(require, exports, module) {
 
       // 初始化 attrs
       var dataAttrsConfig = this._parseDataAttrsConfig(config)
-      this.initAttrs(config, dataAttrsConfig)
+      this.initAttrs(config ? $.extend(dataAttrsConfig, config) : dataAttrsConfig)
 
       // 初始化 props
       this.parseElement()

diff --git a/tests/widget-spec.js b/tests/widget-spec.js
@@ -636,7 +636,8 @@ define(function(require) {
       expect(t.get('arr')).to.eql([1, 2, 3])
     })
 
-    it('onXx setter in attrs', function() {
+    // base 1.1.0 不再支持这种写法
+    xit('onXx setter in attrs', function() {
       var counter = 0
 
       function incr() {