Skip to content

Commit 02bb08f

Browse files
JosemaJosema
committed
Better code style
1 parent e0865bd commit 02bb08f

24 files changed

+313
-287
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dop",
3-
"version": "0.28.1",
3+
"version": "0.28.2",
44
"main": "./dist/dop.nodejs.js",
55
"browser": "./dist/dop.js",
66
"unpkg": "./dist/dop.min.js",
@@ -34,7 +34,7 @@
3434
"client"
3535
],
3636
"dependencies": {
37-
"dop-transports": "^2.0.9"
37+
"dop-transports": "^2.0.10"
3838
},
3939
"devDependencies": {
4040
"coveralls": "^2.11.4",

‎src/api/computed.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ dop.computed = function(callback) {
33
isFunction(callback),
44
'dop.computed needs a function as first parameter'
55
)
6-
var f = function(object, property, shallWeSet, oldValue) {
6+
var f = function(object, property, shall_we_set, old_value) {
77
return dop.core.createComputed(
88
object,
99
property,
1010
callback,
11-
shallWeSet,
12-
oldValue
11+
shall_we_set,
12+
old_value
1313
)
1414
}
1515
f._name = dop.cons.COMPUTED_FUNCTION

‎src/api/removeComputed.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ dop.removeComputed = function(object, property, callback) {
1111
var computed_pathid = dop.core.getPathId(
1212
dop.getObjectPath(object, false).concat(property)
1313
),
14-
shallWeRemoveAll = !isFunction(callback),
15-
isSameFunction,
14+
shall_we_remove_all = !isFunction(callback),
15+
is_same_function,
1616
data_path = dop.data.path,
1717
removed = [],
1818
computed_ids,
@@ -34,8 +34,8 @@ dop.removeComputed = function(object, property, callback) {
3434
for (index = 0; index < computed_ids.length; ++index) {
3535
computed_id = computed_ids[index]
3636
computed = dop.data.computed[computed_id]
37-
isSameFunction = computed.function === callback
38-
if (shallWeRemoveAll || isSameFunction) {
37+
is_same_function = computed.function === callback
38+
if (shall_we_remove_all || is_same_function) {
3939
// Deleting computing itself
4040
delete dop.data.computed[computed_id]
4141
// Removing id in computed
@@ -54,7 +54,7 @@ dop.removeComputed = function(object, property, callback) {
5454
removed.push(computed.function)
5555
}
5656

57-
if (isSameFunction) break
57+
if (is_same_function) break
5858
}
5959
}
6060

‎src/core/api_transports/emitReconnect.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
dop.core.emitReconnect = function(node, oldSocket, newNode) {
1+
dop.core.emitReconnect = function(node, old_socket, new_node) {
22
if (node.listener) {
3-
dop.core.unregisterNode(newNode)
4-
node.listener.emit('reconnect', node, oldSocket)
3+
dop.core.unregisterNode(new_node)
4+
node.listener.emit('reconnect', node, old_socket)
55
}
6-
node.emit('reconnect', oldSocket)
6+
node.emit('reconnect', old_socket)
77
dop.core.sendMessages(node)
88
}

‎src/core/mutators/delete.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
dop.core.delete = function(object, property) {
22
var descriptor = Object.getOwnPropertyDescriptor(object, property)
33
if (descriptor && descriptor.configurable) {
4-
var objectTarget = dop.getObjectTarget(object),
5-
objectProxy = dop.getObjectProxy(object),
4+
var object_target = dop.getObjectTarget(object),
5+
object_proxy = dop.getObjectProxy(object),
66
path,
7-
oldValue = objectTarget[property],
8-
deleted = delete objectTarget[property]
7+
old_value = object_target[property],
8+
deleted = delete object_target[property]
99

1010
if (
11-
(objectTarget === objectProxy || object === objectProxy) &&
11+
(object_target === object_proxy || object === object_proxy) &&
1212
(path = dop.getObjectPath(object))
1313
)
1414
dop.core.storeMutation({
15-
object: dop.getObjectProxy(objectTarget),
15+
object: dop.getObjectProxy(object_target),
1616
prop: String(property),
1717
path: path,
18-
oldValue: dop.util.clone(oldValue)
18+
old_value: dop.util.clone(old_value)
1919
})
2020

2121
// needed for dop.core.proxyObjectHandler.deleteProperty

‎src/core/mutators/reverse.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
// https://jsperf.com/array-reverse-algorithm
22
dop.core.reverse = function(array) {
3-
var objectTarget = dop.getObjectTarget(array),
4-
objectProxy = dop.getObjectProxy(array),
3+
var object_target = dop.getObjectTarget(array),
4+
object_proxy = dop.getObjectProxy(array),
55
path
66

77
if (
8-
(objectTarget === objectProxy || array === objectProxy) &&
8+
(object_target === object_proxy || array === object_proxy) &&
99
(path = dop.getObjectPath(array))
1010
) {
11-
var total = objectTarget.length / 2,
11+
var total = object_target.length / 2,
1212
index = 0,
1313
indexr,
14-
tempItem,
14+
temp_item,
1515
swaps = []
1616

1717
for (; index < total; ++index) {
18-
indexr = objectTarget.length - index - 1
18+
indexr = object_target.length - index - 1
1919
if (index !== indexr) {
20-
tempItem = objectTarget[indexr]
21-
objectTarget[indexr] = objectTarget[index]
22-
objectTarget[index] = tempItem
20+
temp_item = object_target[indexr]
21+
object_target[indexr] = object_target[index]
22+
object_target[index] = temp_item
2323
swaps.push(index, indexr)
2424
}
2525
}
2626

2727
if (swaps.length > 0)
2828
dop.core.storeMutation({
29-
object: objectProxy,
29+
object: object_proxy,
3030
prop: dop.getObjectProperty(array),
3131
path: path,
3232
swaps: swaps
3333
})
34-
} else Array.prototype.reverse.call(objectTarget)
34+
} else Array.prototype.reverse.call(object_target)
3535

3636
return array
3737
}

‎src/core/mutators/set.js‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ dop.core.set = function(object, property, value, options) {
99
var descriptor = Object.getOwnPropertyDescriptor(object, property)
1010

1111
if (!descriptor || (descriptor && descriptor.writable)) {
12-
var objectTarget = dop.getObjectTarget(object),
13-
objectProxy = dop.getObjectProxy(object),
14-
oldValue = objectTarget[property],
15-
length = objectTarget.length,
16-
isNewProperty = !objectTarget.hasOwnProperty(property),
17-
objectIsArray = isArray(objectTarget),
12+
var object_target = dop.getObjectTarget(object),
13+
object_proxy = dop.getObjectProxy(object),
14+
old_value = object_target[property],
15+
length = object_target.length,
16+
is_new_property = !object_target.hasOwnProperty(property),
17+
object_is_array = isArray(object_target),
1818
path
1919

20-
// if (objectIsArray)
20+
// if (object_is_array)
2121
// property = Number(property);
2222

2323
// object or array
@@ -26,56 +26,57 @@ dop.core.set = function(object, property, value, options) {
2626
dop.isPojoObject(value) &&
2727
!(
2828
dop.isRegistered(value) &&
29-
dop.getObjectParent(value) === objectProxy
29+
dop.getObjectParent(value) === object_proxy
3030
)
3131
)
32-
objectTarget[property] = dop.core.configureObject(
32+
object_target[property] = dop.core.configureObject(
3333
value,
3434
property,
35-
objectProxy
35+
object_proxy
3636
)
3737
// computed value
3838
else if (
3939
isFunction(value) &&
4040
value._name == dop.cons.COMPUTED_FUNCTION
4141
)
42-
objectTarget[property] = value(
43-
objectTarget,
42+
object_target[property] = value(
43+
object_target,
4444
property,
4545
false,
46-
oldValue
46+
old_value
4747
)
4848
// other
49-
else objectTarget[property] = value
49+
else object_target[property] = value
5050

5151
if (
5252
!options.shadow &&
53-
(objectTarget === objectProxy || object === objectProxy) &&
54-
!(isFunction(oldValue) && isFunction(value)) &&
53+
(object_target === object_proxy || object === object_proxy) &&
54+
!(isFunction(old_value) && isFunction(value)) &&
5555
(path = dop.getObjectPath(object))
5656
) {
5757
var mutation = {
58-
object: objectProxy,
59-
prop: objectIsArray ? String(property) : property,
58+
object: object_proxy,
59+
prop: object_is_array ? String(property) : property,
6060
path: path,
6161
value: dop.util.clone(value)
6262
}
63-
if (!isNewProperty) mutation.oldValue = dop.util.clone(oldValue)
63+
if (!is_new_property)
64+
mutation.old_value = dop.util.clone(old_value)
6465

6566
dop.core.storeMutation(mutation)
6667

6768
// If is array and length is different we must store the length
6869
if (
6970
property !== 'length' &&
70-
objectTarget.length !== length &&
71-
objectIsArray
71+
object_target.length !== length &&
72+
object_is_array
7273
)
7374
dop.core.storeMutation({
74-
object: objectProxy,
75+
object: object_proxy,
7576
prop: 'length',
7677
path: path,
77-
value: objectTarget.length,
78-
oldValue: length
78+
value: object_target.length,
79+
old_value: length
7980
})
8081
}
8182
}

‎src/core/mutators/sort.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
// http://khan4019.github.io/front-end-Interview-Questions/sort.html#bubbleSort
44
// https://github.com/benoitvallon/computer-science-in-javascript/tree/master/sorting-algorithms-in-javascript
55
dop.core.sort = function(array, compareFunction) {
6-
var objectTarget = dop.getObjectTarget(array),
7-
objectProxy = dop.getObjectProxy(array),
8-
copy = objectTarget.slice(0),
6+
var object_target = dop.getObjectTarget(array),
7+
object_proxy = dop.getObjectProxy(array),
8+
copy = object_target.slice(0),
99
output,
1010
swaps,
1111
path
1212

13-
output = Array.prototype.sort.call(objectTarget, compareFunction)
13+
output = Array.prototype.sort.call(object_target, compareFunction)
1414

1515
if (
16-
(objectTarget === objectProxy || array === objectProxy) &&
16+
(object_target === object_proxy || array === object_proxy) &&
1717
(path = dop.getObjectPath(array))
1818
) {
19-
swaps = dop.core.sortDiff(objectTarget, copy)
19+
swaps = dop.core.sortDiff(object_target, copy)
2020
if (swaps.length > 1)
2121
dop.core.storeMutation({
2222
object: dop.getObjectProxy(array),

‎src/core/mutators/splice.js‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
11
dop.core.splice = function(array, args) {
2-
var objectTarget = dop.getObjectTarget(array),
3-
objectProxy = dop.getObjectProxy(array),
4-
originalLength = objectTarget.length,
2+
var object_target = dop.getObjectTarget(array),
3+
object_proxy = dop.getObjectProxy(array),
4+
original_length = object_target.length,
55
spliced,
66
path
77

88
// Splicing!!
9-
spliced = Array.prototype.splice.apply(objectTarget, args)
9+
spliced = Array.prototype.splice.apply(object_target, args)
1010

11-
// If enviroment do not allow proxies (objectTarget and objectProxy are same object in that case)
11+
// If enviroment do not allow proxies (object_target and object_proxy are same object in that case)
1212
// or if the array is the proxy itself
1313
path = dop.getObjectPath(array)
1414
if (path) {
1515
var argslength = args.length,
16-
length = objectTarget.length,
16+
length = object_target.length,
1717
index = 2,
1818
start = Number(args[0]),
19-
// deleteCount = (Number(args[1])>0) ? args[1] : 0,
19+
// delete_count = (Number(args[1])>0) ? args[1] : 0,
2020
itemslength = args.length > 2 ? args.length - 2 : 0,
2121
item
2222

2323
// Defaults for start
2424
if (isNaN(start)) start = 0
2525
else if (start < 0) start = length + start < 0 ? 0 : length + start
26-
else if (start > originalLength) start = originalLength
26+
else if (start > original_length) start = original_length
2727

2828
// // We dont need update becase no items remaining after splice
2929
// end = (argslength===1) ? 0 :
30-
// // If deleteCount is the same of items to add means the new lengh is the same and we only need to update the new elements
31-
// (argslength>2 && deleteCount===itemslength) ?
32-
// start+deleteCount
30+
// // If delete_count is the same of items to add means the new lengh is the same and we only need to update the new elements
31+
// (argslength>2 && delete_count===itemslength) ?
32+
// start+delete_count
3333
// :
34-
// objectTarget.length;
34+
// object_target.length;
3535

3636
// We must register new objects
3737
for (; index < argslength; ++index, ++start) {
3838
item = args[index]
3939
if (dop.isPojoObject(item))
40-
objectTarget[start] = dop.core.configureObject(
40+
object_target[start] = dop.core.configureObject(
4141
item,
4242
start,
43-
objectProxy
43+
object_proxy
4444
)
4545
}
4646

4747
// Storing mutation
4848
if (
49-
(objectTarget === objectProxy || array === objectProxy) &&
50-
(originalLength !== length || itemslength > 0)
49+
(object_target === object_proxy || array === object_proxy) &&
50+
(original_length !== length || itemslength > 0)
5151
) {
5252
if (args[0] < 0) args[0] = array.length + args[0]
5353
var mutation = {
54-
object: objectProxy,
54+
object: object_proxy,
5555
prop: dop.getObjectProperty(array),
5656
path: path,
5757
splice: args
5858
}
5959

6060
if (spliced.length > 0) mutation.spliced = dop.util.clone(spliced)
6161

62-
if (length !== originalLength) mutation.oldLength = originalLength
62+
if (length !== original_length)
63+
mutation.old_length = original_length
6364

6465
dop.core.storeMutation(mutation)
6566
}

‎src/core/mutators/swap.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dop.core.swap = function(array, swaps) {
2-
var objectTarget = dop.getObjectTarget(array),
3-
objectProxy = dop.getObjectProxy(array)
2+
var object_target = dop.getObjectTarget(array),
3+
object_proxy = dop.getObjectProxy(array)
44

5-
var result = dop.util.swap(objectTarget, swaps)
5+
var result = dop.util.swap(object_target, swaps)
66

7-
if (objectTarget === objectProxy || array === objectProxy)
7+
if (object_target === object_proxy || array === object_proxy)
88
dop.core.storeMutation({
9-
object: objectProxy,
9+
object: object_proxy,
1010
prop: dop.getObjectProperty(array),
1111
path: dop.getObjectPath(array),
1212
swaps: swaps.slice(0)

0 commit comments

Comments
 (0)