6
6
* @description
7
7
*/
8
8
9
- /**
9
+ /**
10
10
* @ngdoc object
11
11
* @name ngResource.$resource
12
12
* @requires $http
@@ -228,46 +228,46 @@ angular.module('ngResource', ['ng']).
228
228
return $parse ( path ) ( obj ) ;
229
229
} ;
230
230
231
- /**
232
- * We need our custom mehtod because encodeURIComponent is too aggressive and doesn't follow
233
- * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
234
- * segments:
235
- * segment = *pchar
236
- * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
237
- * pct-encoded = "%" HEXDIG HEXDIG
238
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
239
- * sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
240
- * / "*" / "+" / "," / ";" / "="
241
- */
242
- function encodeUriSegment ( val ) {
243
- return encodeUriQuery ( val , true ) .
244
- replace ( / % 2 6 / gi, '&' ) .
245
- replace ( / % 3 D / gi, '=' ) .
246
- replace ( / % 2 B / gi, '+' ) ;
247
- }
248
-
249
-
250
- /**
251
- * This method is intended for encoding *key* or *value* parts of query component. We need a custom
252
- * method becuase encodeURIComponent is too agressive and encodes stuff that doesn't have to be
253
- * encoded per http://tools.ietf.org/html/rfc3986:
254
- * query = *( pchar / "/" / "?" )
255
- * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
256
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
257
- * pct-encoded = "%" HEXDIG HEXDIG
258
- * sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
259
- * / "*" / "+" / "," / ";" / "="
260
- */
261
- function encodeUriQuery ( val , pctEncodeSpaces ) {
262
- return encodeURIComponent ( val ) .
263
- replace ( / % 4 0 / gi, '@' ) .
264
- replace ( / % 3 A / gi, ':' ) .
265
- replace ( / % 2 4 / g, '$' ) .
266
- replace ( / % 2 C / gi, ',' ) .
267
- replace ( ( pctEncodeSpaces ? null : / % 2 0 / g) , '+' ) ;
268
- }
269
-
270
- function Route ( template , defaults ) {
231
+ /**
232
+ * We need our custom mehtod because encodeURIComponent is too aggressive and doesn't follow
233
+ * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
234
+ * segments:
235
+ * segment = *pchar
236
+ * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
237
+ * pct-encoded = "%" HEXDIG HEXDIG
238
+ * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
239
+ * sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
240
+ * / "*" / "+" / "," / ";" / "="
241
+ */
242
+ function encodeUriSegment ( val ) {
243
+ return encodeUriQuery ( val , true ) .
244
+ replace ( / % 2 6 / gi, '&' ) .
245
+ replace ( / % 3 D / gi, '=' ) .
246
+ replace ( / % 2 B / gi, '+' ) ;
247
+ }
248
+
249
+
250
+ /**
251
+ * This method is intended for encoding *key* or *value* parts of query component. We need a custom
252
+ * method becuase encodeURIComponent is too agressive and encodes stuff that doesn't have to be
253
+ * encoded per http://tools.ietf.org/html/rfc3986:
254
+ * query = *( pchar / "/" / "?" )
255
+ * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
256
+ * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
257
+ * pct-encoded = "%" HEXDIG HEXDIG
258
+ * sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
259
+ * / "*" / "+" / "," / ";" / "="
260
+ */
261
+ function encodeUriQuery ( val , pctEncodeSpaces ) {
262
+ return encodeURIComponent ( val ) .
263
+ replace ( / % 4 0 / gi, '@' ) .
264
+ replace ( / % 3 A / gi, ':' ) .
265
+ replace ( / % 2 4 / g, '$' ) .
266
+ replace ( / % 2 C / gi, ',' ) .
267
+ replace ( ( pctEncodeSpaces ? null : / % 2 0 / g) , '+' ) ;
268
+ }
269
+
270
+ function Route ( template , defaults ) {
271
271
this . template = template = template + '#' ;
272
272
this . defaults = defaults || { } ;
273
273
var urlParams = this . urlParams = { } ;
@@ -396,11 +396,6 @@ angular.module('ngResource', ['ng']).
396
396
} ;
397
397
398
398
399
- Resource . bind = function ( additionalParamDefaults ) {
400
- return ResourceFactory ( url , extend ( { } , paramDefaults , additionalParamDefaults ) , actions ) ;
401
- } ;
402
-
403
-
404
399
Resource . prototype [ '$' + name ] = function ( a1 , a2 , a3 ) {
405
400
var params = extractParams ( this ) ,
406
401
success = noop ,
@@ -426,6 +421,11 @@ angular.module('ngResource', ['ng']).
426
421
Resource [ name ] . call ( this , params , data , success , error ) ;
427
422
} ;
428
423
} ) ;
424
+
425
+ Resource . bind = function ( additionalParamDefaults ) {
426
+ return ResourceFactory ( url , extend ( { } , paramDefaults , additionalParamDefaults ) , actions ) ;
427
+ } ;
428
+
429
429
return Resource ;
430
430
}
431
431
0 commit comments