vendor/assets/javascripts/angular-resource.js in angularjs-rails-1.2.14 vs vendor/assets/javascripts/angular-resource.js in angularjs-rails-1.2.15

- old
+ new

@@ -1,7 +1,7 @@ /** - * @license AngularJS v1.2.14 + * @license AngularJS v1.2.15 * (c) 2010-2014 Google, Inc. http://angularjs.org * License: MIT */ (function(window, angular, undefined) {'use strict'; @@ -100,11 +100,11 @@ * URL `/path/greet?salutation=Hello`. * * If the parameter value is prefixed with `@` then the value of that parameter is extracted from * the data object (useful for non-GET operations). * - * @param {Object.&lt;Object&gt;=} actions Hash with declaration of custom action that should extend + * @param {Object.<Object>=} actions Hash with declaration of custom action that should extend * the default set of resource actions. The declaration should be created in the format of {@link * ng.$http#usage_parameters $http.config}: * * {action1: {method:?, params:?, isArray:?, headers:?, ...}, * action2: {method:?, params:?, isArray:?, headers:?, ...}, @@ -256,11 +256,11 @@ * all of the non-GET methods are available with `$` prefix. This allows you to easily support CRUD * operations (create, read, update, delete) on server-side data. ```js var User = $resource('/user/:userId', {userId:'@id'}); - var user = User.get({userId:123}, function() { + User.get({userId:123}, function(user) { user.abc = true; user.$save(); }); ``` * @@ -275,9 +275,19 @@ u.$save(function(u, putResponseHeaders) { //u => saved user object //putResponseHeaders => $http header getter }); }); + ``` + * + * You can also access the raw `$http` promise via the `$promise` property on the object returned + * + ``` + var User = $resource('/user/:userId', {userId:'@id'}); + User.get({userId:123}) + .$promise.then(function(user) { + $scope.user = user; + }); ``` * # Creating a custom 'PUT' request * In this example we create a custom method on our resource to make a PUT request * ```js