Merge pull request #42 from samsonasik/fix-base-path

Re-work Fix base path
samsonasik · Oct 31, 2015 · 3e86e1d · 3e86e1d
2 parents 3b64c62 + fae00c7
commit 3e86e1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/view/zend-developer-tools/toolbar/session-data.phtml b/view/zend-developer-tools/toolbar/session-data.phtml
@@ -18,7 +18,7 @@
 /* @var $collector \SanSessionToolbar\Collector\SessionCollector */
 $sessionData = $collector->getSessionData();
 ?>
-<span style="display: none !important;" id="basePath"><?php echo $this->basePath(); ?></span>
+<span style="display: none !important;" id="sanSessionToolbarURL"><?php echo $this->url('san-session-toolbar'); ?></span>
 <div class="zdt-toolbar-entry">
     <div class="zdt-toolbar-preview">
         <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwEETYHpO5gOAAAA+VJREFUOMuVlE1vE1cUhp97Zzwzxp8JiRM7CRQaSkGpUqSisqsEEVIXFEFLu2JZqb+n23ZXqSyqNlCkliBVFawKQbSopA04JLZx7CQ4Xx5PsGfG93ZhOyWkmx7pSOcuznO/3vfAK3Hv/n3+b/xw48aetdkrqtU1stkM31+/7qSSyUu1Wu2DuutORB1nJDs8nBzKZEimUnWt1PK26z7e2Ni4UygWpy9fvNicvnmTSxcuACB6wHz+2YRpGl9JKc4opfB9H7fh8qK2jlKKo0eOEAQB266L32qhlEIIgW1ZvyVisc/fPXXq8Z4TlsqlKxHTOqOUQrXVbsPB/gESiTh3794hFosxOjJCOpHANAwMwwAhztRd9wqwF7iyuqbfGBvD85qk0ymGhzIMDAzgODbLy8uk02nm/prj8dwciUSCzOAg2VyO/r4+nhUKuseRvUIAWoPvtwiCACcaJRp18DwPr9HAth3i8QSe55HP51lcKuA1GiitQexi/gV2mBqtQYjO02qtEUKgBWitoLuWUiKleKVRi33Ab1eChXvFKlIropaFbUUwTbPbLBFCdGBCYEiJZRqg2txbLHOt4i/sk82j7YaceThH8OxvTmX7OHt6ktMTJzmYPIBXr1MsVygsV1ksr7LieswsrVH69U8i4yfJvnlY7gOWcl/wYyPON9ujFCMn+C6/xNfVHXasBO1mG1HbwKoHRNsOKRuy1jbvq3muDt7mwpC7q79doChNMxX8xOXDvxBrziDUS2RTIwLQLQh9CMPOIwnbRCZsXqaG+bL1GR/lPwQ+3gtENPhdHeNh8xD1jRpm4GKIAGFoRLOFXt+CnRYqEkXtpAnDDEknh4iYoOv7rXd1OKIebAUsvljBNCQi3oc+4KAjFjRbYG5C3e38tGNjtEMaa1WOjGY5PxJR114HTsXD8aNpnz9KVeoHBtlI97OTPkhgxwhetlBWDOx1nLBJKqLJWAF9/ibvDeUYy0TG9wEt21Jnp6aYeGcSrRWWaSDQBH6L1RceSzs1VtxVdASSiQTZ3CGOHT/O6MgIxedl9fqVZRiGhiENLNumv7+P428dY3BwAM/zKJfL5BcWePr0KcVSCdd1afo+sqvNdrttdDWtJGAA8UqlkuuwO7ZUShGGIe12mzAMd2tgV+RdO1GpLOeAOGDIro2tmVs/z84/ma8GQYBpmhjdaSKk2OOUnvUMwyAIAuafPKnevjUzC1hAbxsiUkpHKZUGJj+58un5qXPnJk+ceHssGo0mN7c2rUKhSD6f9wvFYn29Vnvuuu6jB7Ozt4FHUsotpVQTCMSr41sIgdZ7JpHRzZ61FNDupvqPHv4BQHLIjBbFaNYAAAAASUVORK5CYII=" alt="SESSION Data" />
@@ -32,4 +32,4 @@ $sessionData = $collector->getSessionData();
 </div>
 <script type="text/javascript">
     <?php $this->escapeJs(include __DIR__ . '/session-toolbar.js'); ?>
-</script>
+</script>
diff --git a/view/zend-developer-tools/toolbar/session-toolbar.js b/view/zend-developer-tools/toolbar/session-toolbar.js
@@ -32,7 +32,7 @@
      * IE 8+
      */
     win.fakejQuery = doc.querySelectorAll.bind(doc)
-    var baseURL = doc.getElementById("basePath").innerHTML;
+    var sanSessionToolbarURL = doc.getElementById("basePath").innerHTML;
 
     var sanSessionToolbar = {
         init: function () {
@@ -59,7 +59,7 @@
             var containerName = trg.parentNode.getAttribute("data-container");
             var keysession = trg.parentNode.getAttribute("data-keysession");
             var params = "containerName="+containerName+"&keysession="+keysession;
-            sanSessionToolbar.postDataWithAjax(baseURL+'/san-session-toolbar/removesession', function (html) {
+            sanSessionToolbar.postDataWithAjax(sanSessionToolbarURL+'/removesession', function (html) {
                 if (html.success) {
                     // top parent level for this session key - span tag
                     var elements = doc.querySelector(".san-session-toolbar-info-containerName-"+containerName+"-keysession-"+keysession);
@@ -76,7 +76,7 @@
             // IE hack
             e = e || window.event;
             e.preventDefault();
-            sanSessionToolbar.postDataWithAjax(baseURL+'/san-session-toolbar/reloadsession', function (html) {
+            sanSessionToolbar.postDataWithAjax(sanSessionToolbarURL+'/reloadsession', function (html) {
                 doc.querySelector('#san-session-toolbar-detail').innerHTML = html.san_sessiontoolbar_data_renderedContent;
             }, null);
         },
@@ -85,7 +85,7 @@
             // IE hack
             e = e || window.event;
             e.preventDefault();
-            sanSessionToolbar.postDataWithAjax(baseURL+'/san-session-toolbar/clearsession', function (html) {
+            sanSessionToolbar.postDataWithAjax(sanSessionToolbarURL+'/clearsession', function (html) {
                 doc.querySelector('#san-session-toolbar-detail').innerHTML = html.san_sessiontoolbar_data_renderedContent;
             }, null);
         },
@@ -98,7 +98,7 @@
             var trg = e.target ? e.target : e.srcElement;
             var params = "byContainer="+trg.getAttribute("data-container");
 
-            sanSessionToolbar.postDataWithAjax(baseURL+'/san-session-toolbar/clearsession', function (html) {
+            sanSessionToolbar.postDataWithAjax(sanSessionToolbarURL+'/clearsession', function (html) {
                 doc.querySelector('#san-session-toolbar-detail').innerHTML = html.san_sessiontoolbar_data_renderedContent;
             }, params);
         },
@@ -144,7 +144,7 @@
             var containerName = trg.parentNode.getAttribute("data-container");
             var keysession = trg.parentNode.getAttribute("data-keysession");
             var params = "containerName="+containerName+"&keysession="+keysession+"&sessionvalue="+doc.querySelector('#san-detail-value-containerName-'+containerName+'-keysession-'+keysession).value+"&new=0";
-            sanSessionToolbar.postDataWithAjax(baseURL+'/san-session-toolbar/savesession', function (html) {
+            sanSessionToolbar.postDataWithAjax(sanSessionToolbarURL+'/savesession', function (html) {
                 if (html.success) {
                     doc.querySelector('#san-session-toolbar-detail').innerHTML = html.san_sessiontoolbar_data_renderedContent;
                 } else {
@@ -191,7 +191,7 @@
             var newSessionData = doc.querySelector('#san-add-value-sessiondata-containerName-'+containerName).value;
             var params = "containerName="+containerName+"&keysession="+newSessionKey+"&sessionvalue="+newSessionData+"&new=1";
 
-            sanSessionToolbar.postDataWithAjax(baseURL+'/san-session-toolbar/savesession', function (html) {
+            sanSessionToolbar.postDataWithAjax(sanSessionToolbarURL+'/savesession', function (html) {
                 if (html.success) {
                     doc.querySelector('#san-session-toolbar-detail').innerHTML = html.san_sessiontoolbar_data_renderedContent;
                 } else {