|
11 | 11 |
|
12 | 12 | var observable = $.observable.Observable = function ( data ) {
|
13 | 13 | this.data = data;
|
14 |
| - } |
| 14 | + }; |
15 | 15 |
|
16 | 16 | observable.prototype = {
|
17 | 17 | data: null,
|
|
29 | 29 | return object;
|
30 | 30 | }
|
31 | 31 | while ( fields.length > 1 ) {
|
32 |
| - field = fields.shift(), |
| 32 | + field = fields.shift(); |
33 | 33 | object = object[ field ];
|
34 | 34 | }
|
35 | 35 | return object[ fields[ 0 ] ];
|
36 | 36 | },
|
37 | 37 |
|
38 | 38 | property: function( path, value ) {
|
| 39 | + var oldValues, newValues, oldValue, changed; |
39 | 40 | if ( $.type( path ) === "object" ) {
|
40 |
| - var oldValues = {}, |
41 |
| - newValues = {}, |
42 |
| - changed = false; |
| 41 | + oldValues = {}; |
| 42 | + newValues = {}; |
| 43 | + changed = false; |
43 | 44 | for ( var key in path ) {
|
44 |
| - var oldValue = this._get( key ); |
| 45 | + oldValue = this._get( key ); |
45 | 46 | if (oldValue != path[ key] ) {
|
46 | 47 | changed = true;
|
47 | 48 | oldValues[ key ] = oldValue;
|
|
54 | 55 | } else if (arguments.length == 1) {
|
55 | 56 | return this._get( path );
|
56 | 57 | } else {
|
57 |
| - var oldValue = this._get( path ); |
| 58 | + oldValue = this._get( path ); |
58 | 59 | // TODO should be strict? currently helpers are unaware of data types, don't do parsing, therefore strict comparison wouldn't be good
|
59 | 60 | if ( oldValue != value ) {
|
60 |
| - var oldValues = {}; |
| 61 | + oldValues = {}; |
61 | 62 | oldValues[ path ] = oldValue;
|
62 |
| - var newValues = {}; |
| 63 | + newValues = {}; |
63 | 64 | newValues[ path ] = value;
|
64 | 65 | return this._property( oldValues, newValues );
|
65 | 66 | }
|
|
103 | 104 | },
|
104 | 105 |
|
105 | 106 | remove: function( index, numToRemove ) {
|
| 107 | + var i, l; |
106 | 108 | if ( $.type( index ) === "array" ) {
|
107 | 109 | // TODO there's probably a more efficient way to do this
|
108 |
| - var i, |
109 |
| - j, |
110 |
| - l, |
| 110 | + var j, |
111 | 111 | m,
|
112 | 112 | removed = [],
|
113 | 113 | toRemove = index;
|
|
132 | 132 | }
|
133 | 133 | if ( $.type( index ) === "object" ) {
|
134 | 134 | numToRemove = 1;
|
135 |
| - for ( var i = 0, l = this.data.length; i < l; i++ ) { |
| 135 | + for ( i = 0, l = this.data.length; i < l; i++ ) { |
136 | 136 | // TODO same as above
|
137 | 137 | if ( this.data[ i ] === index) {
|
138 | 138 | index = i;
|
|
0 commit comments