clean up: class and style no longer need args

mxaGianluca · Sep 4, 2015 · 7e405f0 · 7e405f0
1 parent e70f714
commit 7e405f0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 43 deletions.
diff --git a/src/compiler/compile.js b/src/compiler/compile.js
@@ -461,7 +461,6 @@ function checkElementDirectives (el, options) {
  */
 
 function checkComponent (el, options) {
- // TODO handle literal/dynamic
  var component = _.checkComponent(el, options)
  if (component) {
  var descriptor = {

diff --git a/src/directive.js b/src/directive.js
@@ -23,8 +23,6 @@ var expParser = require('./parsers/expression')
  * @constructor
  */
 
-// TODO: 1.0.0 cleanup the arguments
-
 function Directive (descriptor, vm, el, host, scope, frag) {
  this.vm = vm
  this.el = el

diff --git a/src/directives/internal/class.js b/src/directives/internal/class.js
@@ -5,23 +5,14 @@ var removeClass = _.removeClass
 module.exports = {
 
  update: function (value) {
- if (this.arg) {
- // single toggle
- if (value) {
- addClass(this.el, this.arg)
- } else {
- removeClass(this.el, this.arg)
- }
+ if (value && typeof value === 'string') {
+ this.handleObject(stringToObject(value))
+ } else if (_.isPlainObject(value)) {
+ this.handleObject(value)
+ } else if (_.isArray(value)) {
+ this.handleArray(value)
  } else {
- if (value && typeof value === 'string') {
- this.handleObject(stringToObject(value))
- } else if (_.isPlainObject(value)) {
- this.handleObject(value)
- } else if (_.isArray(value)) {
- this.handleArray(value)
- } else {
- this.cleanup()
- }
+ this.cleanup()
  }
  },
 

diff --git a/src/directives/internal/el.js b/src/directives/internal/el.js
@@ -4,20 +4,9 @@ module.exports = {
 
  priority: 1500,
 
- bind: function () {
- var scope = this._scope || this.vm
- var refs = scope.$$
- var id = this.id = this.arg // bind-el ?
- ? scope.$eval(this.expression)
- : this.expression
-
- if (process.env.NODE_ENV !== 'production' && this.arg) {
- _.log(
- 'You are using bind- syntax on "el", which is a special ' +
- 'attribute. It will be evaluated only once.'
- )
- }
-
+ update: function (id) {
+ this.id = id
+ var refs = (this._scope || this.vm).$$
  if (refs.hasOwnProperty(id)) {
  refs[id] = this.el
  } else {
@@ -26,6 +15,9 @@ module.exports = {
  },
 
  unbind: function () {
- (this._scope || this.vm).$$[this.id] = null
+ var refs = (this._scope || this.vm).$$
+ if (refs[this.id] !== this.el) {
+ refs[this.id] = null
+ }
  }
 }
diff --git a/src/directives/internal/style.js b/src/directives/internal/style.js
@@ -8,17 +8,11 @@ var propCache = {}
 
 module.exports = {
 
- deep: true,
-
  update: function (value) {
- if (this.arg) {
- this.setProp(this.arg, value)
+ if (typeof value === 'object') {
+ this.objectHandler(value)
  } else {
- if (typeof value === 'object') {
- this.objectHandler(value)
- } else {
- this.el.style.cssText = value
- }
+ this.el.style.cssText = value
  }
  },