Commitd089ef6

committed

Some fixes.

1 parent86ec838 commitd089ef6Copy full SHA for d089ef6

File tree

-13

lines changed

-13

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-varobserve=require('../../lib/observe-js/observe-js');`
`2`		`-`
`3`	`1`	`functionlifecycleNoop(resourceName,attrs,cb){`
`4`	`2`	`cb(null,attrs);`
`5`	`3`	`}`
`@@ -799,7 +797,7 @@ function DSProvider() {`
`799`	`797`	`if(typeofObject.observe!=='function'\|\|`
`800`	`798`	`typeofArray.observe!=='function'){`
`801`	`799`	`$rootScope.$watch(function(){`
`802`		`-observe.Platform.performMicrotaskCheckpoint();`
	`800`	`+DSUtils.observe.Platform.performMicrotaskCheckpoint();`
`803`	`801`	`});`
`804`	`802`	`}`
`805`	`803`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-varobserve=require('../../../lib/observe-js/observe-js');`
`2`		`-`
`3`	`1`	`/**`
`4`	`2`	`*@doc method`
`5`	`3`	`*@id DS.sync methods:digest`
`@@ -22,12 +20,13 @@ var observe = require('../../../lib/observe-js/observe-js');`
`22`	`20`	`*`
`23`	`21`	`*/`
`24`	`22`	`functiondigest(){`
`25`		`-if(!this.$rootScope.$$phase){`
`26`		`-this.$rootScope.$apply(function(){`
`27`		`-observe.Platform.performMicrotaskCheckpoint();`
	`23`	`+var_this=this;`
	`24`	`+if(!_this.$rootScope.$$phase){`
	`25`	`+_this.$rootScope.$apply(function(){`
	`26`	`+_this.utils.observe.Platform.performMicrotaskCheckpoint();`
`28`	`27`	`});`
`29`	`28`	`}else{`
`30`		`-observe.Platform.performMicrotaskCheckpoint();`
	`29`	`+_this.utils.observe.Platform.performMicrotaskCheckpoint();`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-varobserve=require('../../../lib/observe-js/observe-js');`
`2`	`1`	`var_compute=require('./compute')._compute;`
`3`	`2`
`4`	`3`	`functionerrorPrefix(resourceName){`
`@@ -156,7 +155,7 @@ function _inject(definition, resource, attrs, options) {`
`156`	`155`	`resource.collection.push(item);`
`157`	`156`
`158`	`157`	`resource.changeHistories[id]=[];`
`159`		`-resource.observers[id]=newobserve.ObjectObserver(item);`
	`158`	`+resource.observers[id]=newDSUtils.observe.ObjectObserver(item);`
`160`	`159`	`resource.observers[id].open(_react,item);`
`161`	`160`	`resource.index.put(id,item);`
`162`	`161`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ var toPromisify = [`
`56`	`56`	`'afterDestroy'`
`57`	`57`	`];`
`58`	`58`
`59`		`-varisRegExp=require('mout/lang/isRegExp');`
`60`	`59`	`vardeepEquals=angular.equals;`
`61`	`60`
`62`	`61`	`varobserve=require('../lib/observe-js/observe-js');`
`@@ -73,7 +72,6 @@ module.exports = ['$q', function ($q) {`
`73`	`72`	`isNumber:angular.isNumber,`
`74`	`73`	`isFunction:angular.isFunction,`
`75`	`74`	`isEmpty:require('mout/lang/isEmpty'),`
`76`		`-isRegExp:isRegExp,`
`77`	`75`	`toJson:JSON.stringify,`
`78`	`76`	`fromJson:angular.fromJson,`
`79`	`77`	`makePath:require('mout/string/makePath'),`

Comments

(0)