Author: chabotc
Date: Fri Nov 7 16:23:20 2008
New Revision: 712319
URL: http://svn.apache.org/viewvc?rev=712319&view=rev
Log:
SHINDIG-685 by Arne Roomann-Kurrik - Add support for changing the view in the
sample container
Modified:
incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
Modified: incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js?rev=712319&r1=712318&r2=712319&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
(original)
+++ incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js Fri
Nov 7 16:23:20 2008
@@ -62,6 +62,11 @@
var viewerId = "john.doe";
var ownerId = "john.doe";
+ var viewMatches = /[?&]view=((?:[^#&]+|&)+)/.exec(parentUrl);
+ var current_view = (viewMatches)
+ ? viewMatches[1]
+ : "default";
+
/**
* Public Variables
*/
@@ -140,6 +145,7 @@
function generateGadgets(metadata) {
// TODO: The gadget.js file should really have a clearGadgets method
+ gadgets.container.view_ = current_view;
gadgets.container.gadgets_ = {};
for (var i = 0; i < metadata.gadgets.length; i++) {
gadget = gadgets.container.createGadget(
@@ -162,6 +168,7 @@
var specUrl = metadata.gadgets[0].url;
gadgets.container.gadgets_[gadget].title = newtitle;
gadgets.container.gadgets_[gadget].specUrl = specUrl;
+ gadgets.container.gadgets_[gadget].secureToken =
escape(generateSecureToken());
}
reloadStateFile(function() {
gadgets.container.renderGadgets();
@@ -173,7 +180,7 @@
context: {
country: "default",
language: "default",
- view: "default",
+ view: current_view,
container: "default"
},
gadgets: [{