Skip to content

use variable already set for URL and remove whitespace. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 3, 2014
Merged

use variable already set for URL and remove whitespace. #20

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
048e5df
use variable already set for URL
DanielOchoa Jun 25, 2014
66291e8
Changed zepto ajax to javascript xmlhttprequest and moved success and…
DanielOchoa Jun 25, 2014
356f4e1
make current path a MeteorRider property so we can use it on the onSu…
DanielOchoa Jun 25, 2014
bc07b30
use native javascript to call events.
DanielOchoa Jun 26, 2014
4817f8c
remove todo comment
DanielOchoa Jun 26, 2014
178bcb4
fix meteorUrl not being defined when object MeteorRider is defined
DanielOchoa Jun 27, 2014
b013189
meteorUrl can now be referenced inside the onSuccess callback
DanielOchoa Jun 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use variable already set for URL
  • Loading branch information
@DanielOchoa
DanielOchoa committed Jun 25, 2014
commit 048e5df55eef45d7dfce730154f98496b100c9e4
10 changes: 5 additions & 5 deletions www/js/meteor-rider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var MeteorRider = {
}
// trigger request
$.ajax({
url: __MeteorRiderConfig__.meteorUrl,
url: meteorUrl,
cache: false,
// TODO: split to method on MeteorRider
error: function( jqXHR, textStatus, errorThrown ) {
Expand All @@ -54,20 +54,20 @@ var MeteorRider = {
data = data.replace(/(href|src|manifest)\=\"\//gm, '$1="' + meteorUrl + '/');
console.log(meteorUrl);
console.log(data);

// set 'currentPath' to empty string if not passed
currentPath = (typeof currentPath === 'string' ? currentPath : '');
// set the window.location object correctly so iron-router
// set the window.location object correctly so iron-router
// and other packages that depend on window.location work correctly
if (typeof window.history.replaceState === 'function') {
// window.history.replaceState() not supported in all clients
window.history.replaceState({}, "", meteorUrl + currentPath);
} else {
// TODO: should we do window.history.add() or something?
}

// replace the document with the new document/data
// this is the REAL hijacking...
// this is the REAL hijacking...
// all old JS remains (unless overwritten, name collision)
// all HTML is replaced/overwritten
// all new CSS/JS is loaded
Expand Down