From ac4c2d6ea5d2cd15bcab95c03da8c8e6180994e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 4 Apr 2011 06:38:38 +0000
Subject: [PATCH] Make use of correct logging library
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2796 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discojuice/www/discojuice/discojuice.control.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/discojuice/www/discojuice/discojuice.control.js b/modules/discojuice/www/discojuice/discojuice.control.js
index 0016c7183..d90975df4 100644
--- a/modules/discojuice/www/discojuice/discojuice.control.js
+++ b/modules/discojuice/www/discojuice/discojuice.control.js
@@ -119,7 +119,7 @@ DiscoJuice.Control = {
"locateMe": function() {
var that = this;
- console.log('Locate me');
+ this.parent.Utils.log('Locate Me');
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(
@@ -159,7 +159,7 @@ DiscoJuice.Control = {
}
);
} else {
- console.log('Did not find navigator.geolocation');
+ this.parent.Utils.log('Did not find navigator.geolocation');
}
},
@@ -302,6 +302,7 @@ DiscoJuice.Control = {
// Setup an iframe to read discovery cookies from other domains
"discoReadSetup": function() {
var settings = this.parent.Utils.options.get('disco');
+
if (!settings) return;
var html = '';
@@ -316,6 +317,8 @@ DiscoJuice.Control = {
for(i = 0; i < stores.length; i++) {
currentStore = stores[i];
+ this.parent.Utils.log('Setting up DisoJuice Read from Store [' + currentStore + ']');
+
iframeurl = currentStore + '?entityID=' + escape(spentityid) + '&isPassive=true&returnIDParam=entityID&return=' + escape(returnurl);
html = '<iframe src="' + iframeurl + '" style="display: none"></iframe>';
--
GitLab