svn commit: r1185947 - /shindig/trunk/features/src/main/javascript/features/container/service.js

[rb...@apache.org]

Author: rbaxter85
Date: Wed Oct 19 01:53:12 2011
New Revision: 1185947

URL: http://svn.apache.org/viewvc?rev=1185947&view=rev
Log:
SHINDIG-1627
Committed For Dan Dumont
Use injected config for rpc endpoint in common container service as defaults if not provided.

Modified:
    shindig/trunk/features/src/main/javascript/features/container/service.js

Modified: shindig/trunk/features/src/main/javascript/features/container/service.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/service.js?rev=1185947&r1=1185946&r2=1185947&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/service.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/service.js Wed Oct 19 01:53:12 2011
@@ -30,19 +30,22 @@
 osapi.container.Service = function(opt_config) {
   var config = this.config_ = opt_config || {};
 
+  var injectedEndpoint = ((gadgets.config.get('osapi') || {}).endPoints ||
+          [window.__API_URI.getOrigin() + '/rpc'])[0];
+  var matches = /^([^\/]*\/\/[^\/]+)(.*)$/.exec(injectedEndpoint);
   /**
    * @type {string}
    * @private
    */
   this.apiHost_ = String(osapi.container.util.getSafeJsonValue(config,
-      osapi.container.ServiceConfig.API_HOST, window.__API_URI.getOrigin()));
+      osapi.container.ServiceConfig.API_HOST, matches[1]));
 
   /**
    * @type {string}
    * @private
    */
   this.apiPath_ = String(osapi.container.util.getSafeJsonValue(config,
-      osapi.container.ServiceConfig.API_PATH, '/rpc'));
+      osapi.container.ServiceConfig.API_PATH, matches[2]));
 
   /**
    * Map of gadget URLs to cached gadgetInfo response.