aboutsummaryrefslogtreecommitdiff
path: root/src/js/chrome/js/platform-ajax.js
diff options
context:
space:
mode:
authorGravatar Rogan Creswick <creswick@gmail.com>2013-12-17 11:25:09 -0800
committerGravatar Rogan Creswick <creswick@gmail.com>2013-12-17 11:25:09 -0800
commit814e6f5e2125a48578d8fa47d06d1d3fb92ef984 (patch)
tree596039fd73dbfd489558d6b6538ebfc41786f332 /src/js/chrome/js/platform-ajax.js
parentaac09743ba9990f0d8a3b0cdcd08acab454062e6 (diff)
parent3f86fd756a146bab5386503dfb2ca11c46f30352 (diff)
Merge pull request #22 from GaloisInc/promises
Modifies fiveui.RuleSet.load to return promises
Diffstat (limited to 'src/js/chrome/js/platform-ajax.js')
-rw-r--r--src/js/chrome/js/platform-ajax.js17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/js/chrome/js/platform-ajax.js b/src/js/chrome/js/platform-ajax.js
index 32aac99..e5b4d1c 100644
--- a/src/js/chrome/js/platform-ajax.js
+++ b/src/js/chrome/js/platform-ajax.js
@@ -13,27 +13,12 @@ fiveui.ajax = fiveui.ajax || {};
*/
fiveui.ajax.get = function(url, options) {
- _.defaults(options, {
- success:function() {},
- error: function() {}
- });
-
- jQuery.ajax(url, {
+ return jQuery.ajax(url, {
cache: false,
dataType: 'text',
- success:function(text) {
- // strip out everything else from the args
- options.success(text);
- },
-
- error:function() {
- // call with no context
- options.error();
- },
-
});
};