computed properties now use $get and $set to be more explicit

Author: Evan You

examples/todomvc/js/app.js

@@ -75,10 +75,10 @@ var app = new Seed({
         },
 
         allDone: {
-            get: function () {
+            $get: function () {
                 return this.remaining === 0
             },
-            set: function (value) {
+            $set: function (value) {
                 this.todos.forEach(function (todo) {
                     todo.completed = value
                 })

src/compiler.js

@@ -429,7 +429,7 @@ CompilerProto.createBinding = function (key, isExp, isFn) {
             log('  created anonymous binding: ' + key)
             binding.value = isFn
                 ? result.getter
-                : { get: result.getter }
+                : { $get: result.getter }
             compiler.markComputed(binding)
             compiler.exps.push(binding)
             // need to create the bindings for keys
@@ -500,7 +500,7 @@ CompilerProto.define = function (key, binding) {
         value = binding.value = vm[key], // save the value before redefinening it
         type = utils.typeOf(value)
 
-    if (type === 'Object' && value.get) {
+    if (type === 'Object' && value.$get) {
         // computed property
         compiler.markComputed(binding)
     } else if (type === 'Object' || type === 'Array') {
@@ -521,14 +521,14 @@ CompilerProto.define = function (key, binding) {
                 ob.emit('get', key)
             }
             return binding.isComputed
-                ? value.get()
+                ? value.$get()
                 : value
         },
         set: function (newVal) {
             var value = binding.value
             if (binding.isComputed) {
-                if (value.set) {
-                    value.set(newVal)
+                if (value.$set) {
+                    value.$set(newVal)
                 }
             } else if (newVal !== value) {
                 // unwatch the old value
@@ -555,8 +555,8 @@ CompilerProto.markComputed = function (binding) {
     if (binding.isFn) {
         binding.value = value.bind(vm)
     } else {
-        value.get = value.get.bind(vm)
-        if (value.set) value.set = value.set.bind(vm)
+        value.$get = value.$get.bind(vm)
+        if (value.$set) value.$set = value.$set.bind(vm)
     }
     // keep track for dep parsing later
     this.computed.push(binding)

src/deps-parser.js

@@ -17,7 +17,7 @@ function catchDeps (binding) {
         binding.deps.push(dep)
         dep.subs.push(binding)
     })
-    binding.value.get()
+    binding.value.$get()
     observer.off('get')
 }
 

src/directive.js

@@ -146,7 +146,7 @@ DirProto.refresh = function (value) {
     if (this.isFn) {
         value = this.value
     } else {
-        value = this.value.get({
+        value = this.value.$get({
             el: this.el,
             vm: this.vm
         })

test/functional/fixtures/nested-props.html

@@ -44,9 +44,11 @@ <h3>Computed property that concats the two: <span sd-text="d"></span></h3>
                         this.a.b.c = 'three'
                         this.a.c = 3
                     },
-                    d: {get: function () {
-                        return this.msg + (this.a.b.c || '') + (this.a.c || '')
-                    }}
+                    d: {
+                        $get: function () {
+                            return this.msg + (this.a.b.c || '') + (this.a.c || '')
+                        }
+                    }
                 }
             })
             var app = new Demo({ el: '#a' })

test/functional/fixtures/share-data.html

@@ -43,7 +43,7 @@
                 scope: {
                     shared: shared,
                     source: {
-                        get: function () {
+                        $get: function () {
                             return JSON.stringify(this.shared)
                         }
                     }

test/unit/specs/deps-parser.js

@@ -18,7 +18,7 @@ describe('UNIT: Dependency Parser', function () {
                 deps: [],
                 subs: [],
                 value: {
-                    get: function () {
+                    $get: function () {
                         if (i > 0) {
                             ob.emit('get', bindings[b.depId])
                         }

test/unit/specs/directive.js

@@ -223,7 +223,7 @@ describe('UNIT: Directive', function () {
             applied = false,
             el = 1, vm = 2,
             value = {
-                get: function (ctx) {
+                $get: function (ctx) {
                     return ctx.el + ctx.vm
                 }
             }