Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
jio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Alexandra Rogova
jio
Commits
d0d50b16
Commit
d0d50b16
authored
Sep 16, 2013
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
JIO uses promy library now
parent
6eb3443c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
793 deletions
+16
-793
src/jio/core/IODeferred.js
src/jio/core/IODeferred.js
+5
-7
src/jio/core/Promise.js
src/jio/core/Promise.js
+0
-775
src/jio/core/util.js
src/jio/core/util.js
+4
-4
src/jio/features/jobChecker.js
src/jio/features/jobChecker.js
+2
-2
src/jio/features/restApi.js
src/jio/features/restApi.js
+1
-1
src/jio/intro.js
src/jio/intro.js
+4
-4
No files found.
src/jio/core/IODeferred.js
View file @
d0d50b16
...
@@ -160,13 +160,11 @@ IODeferred.createFromDeferred = function (method, info, options, deferred) {
...
@@ -160,13 +160,11 @@ IODeferred.createFromDeferred = function (method, info, options, deferred) {
// fail(deferred.reject.bind(deferred)).
// fail(deferred.reject.bind(deferred)).
// progress(deferred.notify.bind(deferred));
// progress(deferred.notify.bind(deferred));
// // phantomjs doesn't like 'bind'...
// // phantomjs doesn't like 'bind'...
iodeferred
.
promise
().
done
(
function
()
{
iodeferred
.
promise
.
then
(
deferred
.
resolve
.
apply
(
deferred
,
arguments
);
deferred
.
resolve
.
bind
(
deferred
),
}).
fail
(
function
()
{
deferred
.
reject
.
bind
(
deferred
),
deferred
.
reject
.
apply
(
deferred
,
arguments
);
deferred
.
notify
.
bind
(
deferred
)
}).
progress
(
function
()
{
);
deferred
.
notify
.
apply
(
deferred
,
arguments
);
});
return
iodeferred
;
return
iodeferred
;
};
};
...
...
src/jio/core/Promise.js
deleted
100644 → 0
View file @
6eb3443c
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */
/*global Deferred, exports, setInterval, setTimeout, clearInterval,
clearTimeout */
/**
* Promise()
*
* @class Promise
* @constructor
*/
function
Promise
()
{
this
.
_onReject
=
[];
this
.
_onResolve
=
[];
this
.
_onProgress
=
[];
this
.
_state
=
""
;
this
.
_answers
=
undefined
;
}
////////////////////////////////////////////////////////////
// http://wiki.commonjs.org/wiki/Promises/B
// when(value, callback, errback_opt)
/**
* when(item, [onSuccess], [onError], [onProgress]): Promise
*
* Return an item as first parameter of the promise answer. If item is of
* type Promise, the method will just return the promise. If item is of type
* Deferred, the method will return the deferred promise.
*
* Promise.when('a').then(console.log); // shows 'a'
*
* @method when
* @static
* @param {Any} item The item to use
* @param {Function} [onSuccess] The callback called on success
* @param {Function} [onError] the callback called on error
* @param {Function} [onProgress] the callback called on progress
* @return {Promise} The promise
*/
Promise
.
when
=
function
(
item
,
onSuccess
,
onError
,
onProgress
)
{
if
(
item
instanceof
Promise
)
{
return
item
.
done
(
onSuccess
).
fail
(
onError
).
progress
(
onProgress
);
}
if
(
typeof
Deferred
===
'
function
'
&&
item
instanceof
Deferred
)
{
return
item
.
promise
().
done
(
onSuccess
).
fail
(
onError
).
progress
(
onProgress
);
}
var
p
=
new
Promise
().
done
(
onSuccess
).
fail
(
onError
).
progress
(
onProgress
);
p
.
defer
().
resolve
(
item
);
return
p
;
};
/**
* error(item, [onError]): Promise
*
* Return an item as first parameter of the promise answer. The method returns a
* rejected promise.
*
* Promise.error('a').then(null, console.log); // shows 'a'
* Promise.error(Promise.when('a')).then(null, console.log); // shows 'a'
*
* @method error
* @static
* @param {Any} item The item to use
* @param {Function} [onError] the callback called on error
* @return {Promise} The promise
*/
Promise
.
error
=
function
(
item
,
onError
)
{
var
p
=
new
Promise
().
fail
(
onError
),
solver
=
p
.
defer
();
Promise
.
when
(
item
,
solver
.
reject
.
bind
(
solver
),
solver
.
reject
.
bind
(
solver
),
solver
.
notify
.
bind
(
solver
)
);
return
p
;
};
/**
* success(item, [onSuccess]): Promise
*
* Return an item as first parameter of the promise answer. The method returns a
* resolved promise.
*
* Promise.success(errorPromise).then(console.log); // shows 'Error'
* Promise.success(Promise.error('a')).then(console.log); // shows 'a'
*
* @method success
* @static
* @param {Any} item The item to use
* @param {Function} [onSuccess] the callback called on success
* @return {Promise} The promise
*/
Promise
.
success
=
function
(
item
,
onSuccess
)
{
var
p
=
new
Promise
().
done
(
onSuccess
),
solver
=
p
.
defer
();
Promise
.
when
(
item
,
solver
.
resolve
.
bind
(
solver
),
solver
.
resolve
.
bind
(
solver
),
solver
.
notify
.
bind
(
solver
)
);
return
p
;
};
////////////////////////////////////////////////////////////
// http://wiki.commonjs.org/wiki/Promises/B
// get(object, name)
/**
* get(dict, property): Promise
*
* Return the dict property as first parameter of the promise answer.
*
* Promise.get({'a': 'b'}, 'a').then(console.log); // shows 'b'
*
* @method get
* @static
* @param {Object} dict The object to use
* @param {String} property The object property name
* @return {Promise} The promise
*/
Promise
.
get
=
function
(
dict
,
property
)
{
var
p
=
new
Promise
(),
solver
=
p
.
defer
();
try
{
solver
.
resolve
(
dict
[
property
]);
}
catch
(
e
)
{
solver
.
reject
(
e
);
}
return
p
;
};
////////////////////////////////////////////////////////////
// http://wiki.commonjs.org/wiki/Promises/B
// put(object, name, value)
/**
* put(dict, property, value): Promise
*
* Set and return the dict property as first parameter of the promise answer.
*
* Promise.put({'a': 'b'}, 'a', 'c').then(console.log); // shows 'c'
*
* @method put
* @static
* @param {Object} dict The object to use
* @param {String} property The object property name
* @param {Any} value The value
* @return {Promise} The promise
*/
Promise
.
put
=
function
(
dict
,
property
,
value
)
{
var
p
=
new
Promise
(),
solver
=
p
.
defer
();
try
{
dict
[
property
]
=
value
;
solver
.
resolve
(
dict
[
property
]);
}
catch
(
e
)
{
solver
.
reject
(
e
);
}
return
p
;
};
/**
* execute(callback): Promise
*
* Execute the callback and use the returned value as promise answer.
*
* Promise.execute(function () {
* return 'a';
* }).then(console.log); // shows 'a'
*
* @method execute
* @static
* @param {Function} callback The callback to execute
* @return {Promise} The promise
*/
Promise
.
execute
=
function
(
callback
)
{
var
p
=
new
Promise
(),
solver
=
p
.
defer
();
try
{
Promise
.
when
(
callback
(),
solver
.
resolve
,
solver
.
reject
);
}
catch
(
e
)
{
solver
.
reject
(
e
);
}
return
p
;
};
/**
* all(items): Promise
*
* Resolve the promise. The item type must be like the item parameter of the
* `when` static method.
*
* Promise.all([promisedError, 'b']).
* then(console.log); // shows [Error, 'b']
*
* @method all
* @static
* @param {Array} items The items to use
* @return {Promise} The promise
*/
Promise
.
all
=
function
(
items
)
{
var
array
=
[],
count
=
0
,
next
=
new
Promise
(),
solver
,
i
;
solver
=
next
.
defer
();
function
succeed
(
i
)
{
return
function
(
answer
)
{
array
[
i
]
=
answer
;
count
+=
1
;
if
(
count
!==
items
.
length
)
{
return
;
}
return
solver
.
resolve
(
array
);
};
}
function
notify
(
i
)
{
return
function
(
answer
)
{
solver
.
notify
(
i
,
answer
);
};
}
for
(
i
=
0
;
i
<
items
.
length
;
i
+=
1
)
{
Promise
.
when
(
items
[
i
],
succeed
(
i
),
succeed
(
i
),
notify
(
i
));
}
return
next
;
};
/**
* allOrNone(items): Promise
*
* Resolve the promise only when all items are resolved. If one item fails, then
* reject. The item type must be like the item parameter of the `when` static
* method.
*
* Promise.allOrNone([Promise.when('a'), 'b']).
* then(console.log); // shows ['a', 'b']
*
* @method allOrNone
* @static
* @param {Array} items The items to use
* @return {Promise} The promise
*/
Promise
.
allOrNone
=
function
(
items
)
{
var
array
=
[],
count
=
0
,
next
=
new
Promise
(),
solver
;
solver
=
next
.
defer
();
items
.
forEach
(
function
(
item
,
i
)
{
Promise
.
when
(
item
,
function
(
answer
)
{
array
[
i
]
=
answer
;
count
+=
1
;
if
(
count
!==
items
.
length
)
{
return
;
}
return
solver
.
resolve
(
array
);
},
function
(
answer
)
{
return
solver
.
reject
(
answer
);
},
function
(
answer
)
{
solver
.
notify
(
i
,
answer
);
});
});
return
next
;
};
/**
* any(items): Promise
*
* Resolve the promise only when one of the items is resolved. The item type
* must be like the item parameter of the `when` static method.
*
* Promise.any([promisedError, Promise.delay(10)]).
* then(console.log); // shows 10
*
* @method any
* @static
* @param {Array} items The items to use
* @return {Promise} The promise
*/
Promise
.
any
=
function
(
items
)
{
var
count
=
0
,
next
=
new
Promise
(),
solver
,
i
;
solver
=
next
.
defer
();
function
onError
(
answer
)
{
count
+=
1
;
if
(
count
===
items
.
length
)
{
solver
.
reject
(
answer
);
}
}
for
(
i
=
0
;
i
<
items
.
length
;
i
+=
1
)
{
Promise
.
when
(
items
[
i
],
solver
.
resolve
,
onError
);
}
return
next
;
};
/**
* first(items): Promise
*
* Resolve the promise only when one item is resolved. The item type must be
* like the item parameter of the `when` static method.
*
* Promise.first([Promise.delay(100), 'b']).then(console.log); // shows 'b'
*
* @method first
* @static
* @param {Array} items The items to use
* @return {Promise} The promise
*/
Promise
.
first
=
function
(
items
)
{
// *promises
var
next
=
new
Promise
(),
solver
=
next
.
defer
(),
i
;
for
(
i
=
0
;
i
<
items
.
length
;
i
+=
1
)
{
Promise
.
when
(
items
[
i
],
solver
.
resolve
,
solver
.
reject
);
}
return
next
;
};
/**
* delay(timeout[, every]): Promise
*
* Resolve the promise after `timeout` milliseconds and notfies us every `every`
* milliseconds.
*
* Promise.delay(50, 10).then(console.log, console.error, console.log);
* // // shows
* // 10 // from progress
* // 20 // from progress
* // 30 // from progress
* // 40 // from progress
* // 50 // from success
*
* @method delay
* @static
* @param {Number} timeout In milliseconds
* @param {Number} [every] In milliseconds
* @return {Promise} The promise
*/
Promise
.
delay
=
function
(
timeout
,
every
)
{
var
next
=
new
Promise
(),
solver
,
ident
,
now
=
0
;
solver
=
next
.
defer
();
if
(
typeof
every
===
'
number
'
&&
isFinite
(
every
))
{
ident
=
setInterval
(
function
()
{
now
+=
every
;
solver
.
notify
(
now
);
},
every
);
}
setTimeout
(
function
()
{
clearInterval
(
ident
);
solver
.
resolve
(
timeout
);
},
timeout
);
return
next
;
};
/**
* timeout(item, timeout): Promise
*
* If the promise is not resolved after `timeout` milliseconds, it returns a
* timeout error.
*
* Promise.timeout('a', 100).then(console.log); // shows 'a'
*
* Promise.timeout(Promise.delay(100), 10).then(console.log, console.error);
* // shows Error Timeout
*
* @method timeout
* @static
* @param {Any} Item The item to use
* @param {Number} timeout In milliseconds
* @return {Promise} The promise
*/
Promise
.
timeout
=
function
(
item
,
timeout
)
{
var
next
=
new
Promise
(),
solver
,
i
;
solver
=
next
.
defer
();
i
=
setTimeout
(
function
()
{
solver
.
reject
(
new
Error
(
"
Timeout
"
));
},
timeout
);
Promise
.
when
(
item
,
function
()
{
clearTimeout
(
i
);
solver
.
resolve
.
apply
(
solver
,
arguments
);
},
function
()
{
clearTimeout
(
i
);
solver
.
reject
.
apply
(
solver
,
arguments
);
});
return
next
;
};
/**
* defer([callback]): Promise
*
* Set the promise to the 'running' state. If `callback` is a function, then it
* will be executed with a solver as first parameter and returns the promise.
* Else it returns the promise solver.
*
* @method defer
* @param {Function} [callback] The callback to execute
* @return {Promise,Object} The promise or the promise solver
*/
Promise
.
prototype
.
defer
=
function
(
callback
)
{
var
that
=
this
;
switch
(
this
.
_state
)
{
case
"
running
"
:
case
"
resolved
"
:
case
"
rejected
"
:
throw
new
Error
(
"
Promise().defer(): Already
"
+
this
.
_state
);
default
:
break
;
}
function
createSolver
()
{
return
{
"
resolve
"
:
function
()
{
var
array
;
if
(
that
.
_state
!==
"
resolved
"
&&
that
.
_state
!==
"
rejected
"
)
{
that
.
_state
=
"
resolved
"
;
that
.
_answers
=
arguments
;
array
=
that
.
_onResolve
.
slice
();
setTimeout
(
function
()
{
var
i
;
for
(
i
=
0
;
i
<
array
.
length
;
i
+=
1
)
{
try
{
array
[
i
].
apply
(
that
,
that
.
_answers
);
}
catch
(
ignore
)
{}
// errors will never be retrieved by global
}
});
// free the memory
that
.
_onResolve
=
undefined
;
that
.
_onReject
=
undefined
;
that
.
_onProgress
=
undefined
;
}
},
"
reject
"
:
function
()
{
var
array
;
if
(
that
.
_state
!==
"
resolved
"
&&
that
.
_state
!==
"
rejected
"
)
{
that
.
_state
=
"
rejected
"
;
that
.
_answers
=
arguments
;
array
=
that
.
_onReject
.
slice
();
setTimeout
(
function
()
{
var
i
;
for
(
i
=
0
;
i
<
array
.
length
;
i
+=
1
)
{
try
{
array
[
i
].
apply
(
that
,
that
.
_answers
);
}
catch
(
ignore
)
{}
// errors will never be retrieved by global
}
});
// free the memory
that
.
_onResolve
=
undefined
;
that
.
_onReject
=
undefined
;
that
.
_onProgress
=
undefined
;
}
},
"
notify
"
:
function
()
{
if
(
that
.
_onProgress
)
{
var
i
;
for
(
i
=
0
;
i
<
that
.
_onProgress
.
length
;
i
+=
1
)
{
try
{
that
.
_onProgress
[
i
].
apply
(
that
,
arguments
);
}
catch
(
ignore
)
{}
// errors will never be retrieved by global
}
}
}
};
}
this
.
_state
=
"
running
"
;
if
(
typeof
callback
===
'
function
'
)
{
callback
(
createSolver
());
return
this
;
}
return
createSolver
();
};
////////////////////////////////////////////////////////////
// http://wiki.commonjs.org/wiki/Promises/A
// then(fulfilledHandler, errorHandler, progressHandler)
/**
* then([onSuccess], [onError], [onProgress]): Promise
*
* Returns a new Promise with the return value of the `onSuccess` or `onError`
* callback as first parameter. If the pervious promise is resolved, the
* `onSuccess` callback is called. If rejected, the `onError` callback is
* called. If notified, `onProgress` is called.
*
* Promise.when(1).
* then(function (one) { return one + 1; }).
* then(console.log); // shows 2
*
* @method then
* @param {Function} [onSuccess] The callback to call on resolve
* @param {Function} [onError] The callback to call on reject
* @param {Function} [onProgress] The callback to call on notify
* @return {Promise} The new promise
*/
Promise
.
prototype
.
then
=
function
(
onSuccess
,
onError
,
onProgress
)
{
var
next
=
new
Promise
(),
that
=
this
,
resolver
=
next
.
defer
();
switch
(
this
.
_state
)
{
case
"
resolved
"
:
if
(
typeof
onSuccess
===
'
function
'
)
{
setTimeout
(
function
()
{
try
{
Promise
.
when
(
onSuccess
.
apply
(
that
,
that
.
_answers
),
resolver
.
resolve
,
resolver
.
reject
);
}
catch
(
e
)
{
resolver
.
reject
(
e
);
}
});
}
else
{
setTimeout
(
function
()
{
resolver
.
resolve
.
apply
(
resolver
,
that
.
_answers
);
});
}
break
;
case
"
rejected
"
:
if
(
typeof
onError
===
'
function
'
)
{
setTimeout
(
function
()
{
var
result
=
onError
.
apply
(
that
,
that
.
_answers
);
if
(
result
===
undefined
)
{
return
resolver
.
reject
.
apply
(
resolver
,
that
.
_answers
);
}
try
{
Promise
.
when
(
result
,
resolver
.
reject
,
resolver
.
reject
);
}
catch
(
e
)
{
resolver
.
reject
(
e
);
}
});
}
else
{
setTimeout
(
function
()
{
resolver
.
reject
.
apply
(
resolver
,
that
.
_answers
);
});
}
break
;
default
:
if
(
typeof
onSuccess
===
'
function
'
)
{
this
.
_onResolve
.
push
(
function
()
{
try
{
Promise
.
when
(
onSuccess
.
apply
(
that
,
arguments
),
resolver
.
resolve
,
resolver
.
reject
,
resolver
.
notify
);
}
catch
(
e
)
{
resolver
.
reject
(
e
);
}
});
}
else
{
this
.
_onResolve
.
push
(
function
()
{
resolver
.
resolve
.
apply
(
resolver
,
arguments
);
});
}
if
(
typeof
onError
===
'
function
'
)
{
this
.
_onReject
.
push
(
function
()
{
try
{
Promise
.
when
(
onError
.
apply
(
that
,
that
.
_answers
),
resolver
.
reject
,
resolver
.
reject
);
}
catch
(
e
)
{
resolver
.
reject
(
e
);
}
});
}
else
{
this
.
_onReject
.
push
(
function
()
{
resolver
.
reject
.
apply
(
resolver
,
that
.
_answers
);
});
}
if
(
typeof
onProgress
===
'
function
'
)
{
this
.
_onProgress
.
push
(
function
()
{
var
result
;
try
{
result
=
onProgress
.
apply
(
that
,
arguments
);
if
(
result
===
undefined
)
{
resolver
.
notify
.
apply
(
that
,
arguments
);
}
else
{
resolver
.
notify
(
result
);
}
}
catch
(
e
)
{
resolver
.
notify
.
apply
(
that
,
arguments
);
}
});
}
else
{
this
.
_onProgress
.
push
(
function
()
{
resolver
.
notify
.
apply
(
resolver
,
arguments
);
});
}
break
;
}
return
next
;
};
////////////////////////////////////////////////////////////
// http://wiki.commonjs.org/wiki/Promises/A
// get(propertyName)
/**
* get(property): Promise
*
* Get the property of the promise response as first parameter of the new
* Promise.
*
* Promise.when({'a': 'b'}).get('a').then(console.log); // shows 'b'
*
* @method get
* @param {String} property The object property name
* @return {Promise} The promise
*/
Promise
.
prototype
.
get
=
function
(
property
)
{
return
this
.
then
(
function
(
dict
)
{
return
dict
[
property
];
});
};
////////////////////////////////////////////////////////////
// http://wiki.commonjs.org/wiki/Promises/A
// call(functionName, arg1, arg2, ...)
Promise
.
prototype
.
call
=
function
(
function_name
)
{
var
args
=
Array
.
prototype
.
slice
.
call
(
arguments
,
1
);
return
this
.
then
(
function
(
dict
)
{
return
dict
[
function_name
].
apply
(
dict
,
args
);
});
};
/**
* done(callback): Promise
*
* Call the callback on resolve.
*
* Promise.when(1).
* done(function (one) { return one + 1; }).
* done(console.log); // shows 1
*
* @method done
* @param {Function} callback The callback to call on resolve
* @return {Promise} This promise
*/
Promise
.
prototype
.
done
=
function
(
callback
)
{
var
that
=
this
;
if
(
typeof
callback
!==
'
function
'
)
{
return
this
;
}
switch
(
this
.
_state
)
{
case
"
resolved
"
:
setTimeout
(
function
()
{
try
{
callback
.
apply
(
that
,
that
.
_answers
);
}
catch
(
ignore
)
{}
// errors will never be retrieved by global
});
break
;
case
"
rejected
"
:
break
;
default
:
this
.
_onResolve
.
push
(
callback
);
break
;
}
return
this
;
};
/**
* fail(callback): Promise
*
* Call the callback on reject.
*
* promisedTypeError().
* fail(function (e) { name_error(); }).
* fail(console.log); // shows TypeError
*
* @method fail
* @param {Function} callback The callback to call on reject
* @return {Promise} This promise
*/
Promise
.
prototype
.
fail
=
function
(
callback
)
{
var
that
=
this
;
if
(
typeof
callback
!==
'
function
'
)
{
return
this
;
}
switch
(
this
.
_state
)
{
case
"
rejected
"
:
setTimeout
(
function
()
{
try
{
callback
.
apply
(
that
,
that
.
_answers
);
}
catch
(
ignore
)
{}
// errors will never be retrieved by global
});
break
;
case
"
resolved
"
:
break
;
default
:
this
.
_onReject
.
push
(
callback
);
break
;
}
return
this
;
};
/**
* progress(callback): Promise
*
* Call the callback on notify.
*
* Promise.delay(100, 10).
* progress(function () { return null; }).
* progress(console.log); // does not show null
*
* @method progress
* @param {Function} callback The callback to call on notify
* @return {Promise} This promise
*/
Promise
.
prototype
.
progress
=
function
(
callback
)
{
if
(
typeof
callback
!==
'
function
'
)
{
return
this
;
}
switch
(
this
.
_state
)
{
case
"
rejected
"
:
case
"
resolved
"
:
break
;
default
:
this
.
_onProgress
.
push
(
callback
);
break
;
}
return
this
;
};
/**
* always(callback): Promise
*
* Call the callback on resolve or on reject.
*
* sayHello().
* done(iAnswer).
* fail(iHeardNothing).
* always(iKeepWalkingAnyway);
*
* @method always
* @param {Function} callback The callback to call on resolve or on reject
* @return {Promise} This promise
*/
Promise
.
prototype
.
always
=
function
(
callback
)
{
var
that
=
this
;
if
(
typeof
callback
!==
'
function
'
)
{
return
this
;
}
switch
(
this
.
_state
)
{
case
"
resolved
"
:
case
"
rejected
"
:
setTimeout
(
function
()
{
try
{
callback
.
apply
(
that
,
that
.
_answers
);
}
catch
(
ignore
)
{}
// errors will never be retrieved by global
});
break
;
default
:
that
.
_onReject
.
push
(
callback
);
that
.
_onResolve
.
push
(
callback
);
break
;
}
return
this
;
};
function
Deferred
()
{
this
.
_promise
=
new
Promise
();
this
.
_solver
=
this
.
_promise
.
defer
();
}
Deferred
.
prototype
.
resolve
=
function
()
{
this
.
_solver
.
resolve
.
apply
(
this
.
_solver
,
arguments
);
};
Deferred
.
prototype
.
reject
=
function
()
{
this
.
_solver
.
reject
.
apply
(
this
.
_solver
,
arguments
);
};
Deferred
.
prototype
.
notify
=
function
()
{
this
.
_solver
.
notify
.
apply
(
this
.
_solver
,
arguments
);
};
Deferred
.
prototype
.
promise
=
function
()
{
return
this
.
_promise
;
};
exports
.
Promise
=
Promise
;
exports
.
Deferred
=
Deferred
;
src/jio/core/util.js
View file @
d0d50b16
...
@@ -315,7 +315,7 @@ function readBlobAsBinaryString(blob) {
...
@@ -315,7 +315,7 @@ function readBlobAsBinaryString(blob) {
fr
.
onerror
=
deferred
.
reject
.
bind
(
deferred
);
fr
.
onerror
=
deferred
.
reject
.
bind
(
deferred
);
fr
.
onprogress
=
deferred
.
notify
.
bind
(
deferred
);
fr
.
onprogress
=
deferred
.
notify
.
bind
(
deferred
);
fr
.
readAsBinaryString
(
blob
);
fr
.
readAsBinaryString
(
blob
);
return
deferred
.
promise
()
;
return
deferred
.
promise
;
}
}
exports
.
util
.
readBlobAsBinaryString
=
readBlobAsBinaryString
;
exports
.
util
.
readBlobAsBinaryString
=
readBlobAsBinaryString
;
...
@@ -325,7 +325,7 @@ function readBlobAsArrayBuffer(blob) {
...
@@ -325,7 +325,7 @@ function readBlobAsArrayBuffer(blob) {
fr
.
onerror
=
deferred
.
reject
.
bind
(
deferred
);
fr
.
onerror
=
deferred
.
reject
.
bind
(
deferred
);
fr
.
onprogress
=
deferred
.
notify
.
bind
(
deferred
);
fr
.
onprogress
=
deferred
.
notify
.
bind
(
deferred
);
fr
.
readAsArrayBuffer
(
blob
);
fr
.
readAsArrayBuffer
(
blob
);
return
deferred
.
promise
()
;
return
deferred
.
promise
;
}
}
exports
.
util
.
readBlobAsArrayBuffer
=
readBlobAsArrayBuffer
;
exports
.
util
.
readBlobAsArrayBuffer
=
readBlobAsArrayBuffer
;
...
@@ -335,7 +335,7 @@ function readBlobAsText(blob) {
...
@@ -335,7 +335,7 @@ function readBlobAsText(blob) {
fr
.
onerror
=
deferred
.
reject
.
bind
(
deferred
);
fr
.
onerror
=
deferred
.
reject
.
bind
(
deferred
);
fr
.
onprogress
=
deferred
.
notify
.
bind
(
deferred
);
fr
.
onprogress
=
deferred
.
notify
.
bind
(
deferred
);
fr
.
readAsText
(
blob
);
fr
.
readAsText
(
blob
);
return
deferred
.
promise
()
;
return
deferred
.
promise
;
}
}
exports
.
util
.
readBlobAsText
=
readBlobAsText
;
exports
.
util
.
readBlobAsText
=
readBlobAsText
;
...
@@ -377,7 +377,7 @@ function ajax(param) {
...
@@ -377,7 +377,7 @@ function ajax(param) {
param
.
beforeSend
(
xhr
);
param
.
beforeSend
(
xhr
);
}
}
xhr
.
send
(
param
.
data
);
xhr
.
send
(
param
.
data
);
return
deferred
.
promise
()
;
return
deferred
.
promise
;
}
}
exports
.
util
.
ajax
=
ajax
;
exports
.
util
.
ajax
=
ajax
;
...
...
src/jio/features/jobChecker.js
View file @
d0d50b16
...
@@ -20,7 +20,7 @@ function enableJobChecker(jio, shared, options) {
...
@@ -20,7 +20,7 @@ function enableJobChecker(jio, shared, options) {
shared
.
job_rule_actions
=
{
shared
.
job_rule_actions
=
{
wait
:
function
(
original_job
,
new_job
)
{
wait
:
function
(
original_job
,
new_job
)
{
original_job
.
deferred
.
promise
()
.
always
(
function
()
{
original_job
.
deferred
.
promise
.
always
(
function
()
{
shared
.
emit
(
'
job
'
,
new_job
);
shared
.
emit
(
'
job
'
,
new_job
);
});
});
new_job
.
state
=
'
waiting
'
;
new_job
.
state
=
'
waiting
'
;
...
@@ -35,7 +35,7 @@ function enableJobChecker(jio, shared, options) {
...
@@ -35,7 +35,7 @@ function enableJobChecker(jio, shared, options) {
if
(
!
original_job
.
deferred
)
{
if
(
!
original_job
.
deferred
)
{
original_job
.
deferred
=
new_job
.
deferred
;
original_job
.
deferred
=
new_job
.
deferred
;
}
else
{
}
else
{
original_job
.
deferred
.
promise
()
.
original_job
.
deferred
.
promise
.
done
(
new_job
.
command
.
resolve
).
done
(
new_job
.
command
.
resolve
).
fail
(
new_job
.
command
.
reject
);
fail
(
new_job
.
command
.
reject
);
}
}
...
...
src/jio/features/restApi.js
View file @
d0d50b16
...
@@ -52,7 +52,7 @@ function enableRestAPI(jio, shared) { // (jio, shared, options)
...
@@ -52,7 +52,7 @@ function enableRestAPI(jio, shared) { // (jio, shared, options)
param
.
options
=
deepClone
(
type_dict
.
object
.
shift
())
||
{};
param
.
options
=
deepClone
(
type_dict
.
object
.
shift
())
||
{};
//param.deferred = new IODeferred(method, param.kwargs, param.options);
//param.deferred = new IODeferred(method, param.kwargs, param.options);
param
.
deferred
=
new
Deferred
();
param
.
deferred
=
new
Deferred
();
promise
=
param
.
deferred
.
promise
()
;
promise
=
param
.
deferred
.
promise
;
type_dict
[
'
function
'
]
=
type_dict
[
'
function
'
]
||
[];
type_dict
[
'
function
'
]
=
type_dict
[
'
function
'
]
||
[];
if
(
type_dict
[
'
function
'
].
length
===
1
)
{
if
(
type_dict
[
'
function
'
].
length
===
1
)
{
callback
=
type_dict
[
'
function
'
].
shift
();
callback
=
type_dict
[
'
function
'
].
shift
();
...
...
src/jio/intro.js
View file @
d0d50b16
...
@@ -4,11 +4,11 @@
...
@@ -4,11 +4,11 @@
return
define
(
dependencies
,
module
);
return
define
(
dependencies
,
module
);
}
}
if
(
typeof
exports
===
'
object
'
)
{
if
(
typeof
exports
===
'
object
'
)
{
return
module
(
exports
);
return
module
(
exports
,
require
(
'
promy
'
),
require
(
'
sha256
'
)
);
}
}
window
.
jIO
=
{};
window
.
jIO
=
{};
module
(
window
.
jIO
,
{
hex_sha256
:
hex_sha256
});
module
(
window
.
jIO
,
promy
,
{
hex_sha256
:
hex_sha256
});
}([
'
exports
'
,
'
sha256
'
],
function
(
exports
,
sha256
)
{
}([
'
exports
'
,
'
promy
'
,
'
sha256
'
],
function
(
exports
,
promy
,
sha256
)
{
"
use strict
"
;
"
use strict
"
;
var
hex_sha256
=
sha256
.
hex_sha256
;
var
hex_sha256
=
sha256
.
hex_sha256
,
Deferred
=
promy
.
Deferred
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment