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