Author: [email protected]
Date: Tue Jan 17 16:36:46 2012
New Revision: 1920
Log:
[AMDATUOPENSOCIAL-178] Fixed variable name conflicts with aggregated js
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard_store_persistent.js
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/gadgetstore.js
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard_store_persistent.js
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard_store_persistent.js
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard_store_persistent.js
Tue Jan 17 16:36:46 2012
@@ -1,11 +1,11 @@
-var basepath = contextPath + "/rest/dashboards";
+var dbStoreBasepath = contextPath + "/rest/dashboards";
var dashboardPersistentStore = function() {
function setValue(id, dashboard) {
statusbar.showInfo("Saving dashboard...", 10000, true);
var postdata = "{result : " + dashboard + "}";
- var url = basepath + "/" + id;
+ var url = dbStoreBasepath + "/" + id;
jQuery.ajax({
url: url,
type: "PUT",
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/gadgetstore.js
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/gadgetstore.js
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/gadgetstore.js
Tue Jan 17 16:36:46 2012
@@ -1,10 +1,10 @@
-var basepath = contextPath + "/rest/gadgetstore/gadgets";
+var storeBasepath = contextPath + "/rest/gadgetstore/gadgets";
// Adds a gadget to the gadget repository and return the widget wrapping the
gadget
addGadgetToRepository = function(uri, catId) {
var widget;
uri = trim(uri);
- var url = basepath + "?uri="+ encodeURIComponent(uri) + "&category=" +
encodeURIComponent(catId);
+ var url = storeBasepath + "?uri="+ encodeURIComponent(uri) + "&category=" +
encodeURIComponent(catId);
jQuery.ajax({
url: url,
type: "POST",
@@ -21,7 +21,7 @@
}
removeGadgetFromRepository = function(uri) {
- var url = basepath + "?uri="+ encodeURIComponent(uri);
+ var url = storeBasepath + "?uri="+ encodeURIComponent(uri);
var removed = false;
jQuery.ajax({
url: url,
@@ -39,7 +39,7 @@
getGadget = function(uri) {
var gadget;
- var url = basepath + "?uri="+ encodeURIComponent(uri);
+ var url = storeBasepath + "?uri="+ encodeURIComponent(uri);
jQuery.ajax({
url: url,
type: "GET",
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
