[linterna-magica-commit] [394] Merging r393 from trunk to the stale branch.

[Ivaylo Valkov]

Revision: 394
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=394
Author:   valkov
Date:     2013-02-17 11:22:18 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Merging r393 from trunk to the stale branch.

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=393

Modified Paths:
--------------
    branches/0.0.13/src/lm_jsonp_requests.js

Property Changed:
----------------
    branches/0.0.13/


Property changes on: branches/0.0.13
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:390-391
   + /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:390-391,393

Modified: branches/0.0.13/src/lm_jsonp_requests.js
===================================================================
--- branches/0.0.13/src/lm_jsonp_requests.js    2013-02-17 11:21:14 UTC (rev 
393)
+++ branches/0.0.13/src/lm_jsonp_requests.js    2013-02-17 11:22:18 UTC (rev 
394)
@@ -151,8 +151,7 @@
            window.location.toString().split("&linterna_magica");
 
        // Clear our data from the address field
-       // window.location = jsonp_data[0]+jsonp_data[jsonp_data.length-1];
-       history.go(-1);
+       window.location = jsonp_data[0]+jsonp_data[jsonp_data.length-1];
        
        // Cleanup the checker object/frame
        var o = document.getElementById(data.frame_id);