diff options
| author | Misko Hevery | 2011-08-10 13:15:43 -0700 | 
|---|---|---|
| committer | Misko Hevery | 2011-08-12 15:47:47 -0700 | 
| commit | 42062dab34192d2cb9ed66a720c0f791408c61c0 (patch) | |
| tree | ca85b56f12dd0138dbe3d7f1346c4125d64e09a5 /src/service/xhr.js | |
| parent | 1c9fc1e1dec67c8c05f02da1e0853439238c4d8e (diff) | |
| download | angular.js-42062dab34192d2cb9ed66a720c0f791408c61c0.tar.bz2 | |
refactor(scope): remove $flush/$observe ng:eval/ng:eval-order
Diffstat (limited to 'src/service/xhr.js')
| -rw-r--r-- | src/service/xhr.js | 30 | 
1 files changed, 14 insertions, 16 deletions
diff --git a/src/service/xhr.js b/src/service/xhr.js index 224bc57a..bf882684 100644 --- a/src/service/xhr.js +++ b/src/service/xhr.js @@ -10,8 +10,6 @@   *                    in your tests   * @requires $xhr.error $xhr delegates all non `2xx` response code to this service.   * @requires $log $xhr delegates all exceptions to `$log.error()`. - * @requires $updateView After a server response the view needs to be updated for data-binding to - *           take effect.   *   * @description   * Generates an XHR request. The $xhr service delegates all requests to @@ -173,8 +171,8 @@       </doc:scenario>     </doc:example>   */ -angularServiceInject('$xhr', function($browser, $error, $log, $updateView){ - +angularServiceInject('$xhr', function($browser, $error, $log){ +  var rootScope = this;    var xhrHeaderDefaults = {      common: {        "Accept": "application/json, text/plain, */*", @@ -206,19 +204,19 @@ angularServiceInject('$xhr', function($browser, $error, $log, $updateView){              response = fromJson(response, true);            }          } -        if (200 <= code && code < 300) { -          success(code, response); -        } else if (isFunction(error)) { -          error(code, response); -        } else { -          $error( -            {method: method, url: url, data: post, success: success}, -            {status: code, body: response}); -        } +        rootScope.$apply(function(){ +          if (200 <= code && code < 300) { +              success(code, response); +          } else if (isFunction(error)) { +            error(code, response); +          } else { +            $error( +              {method: method, url: url, data: post, success: success}, +              {status: code, body: response}); +          } +        });        } catch (e) {          $log.error(e); -      } finally { -        $updateView();        }      }, extend({'X-XSRF-TOKEN': $browser.cookies()['XSRF-TOKEN']},                xhrHeaderDefaults.common, @@ -228,4 +226,4 @@ angularServiceInject('$xhr', function($browser, $error, $log, $updateView){    xhr.defaults = {headers: xhrHeaderDefaults};    return xhr; -}, ['$browser', '$xhr.error', '$log', '$updateView']); +}, ['$browser', '$xhr.error', '$log']);  | 
