Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Prefetch: Check for existance of options object before checking prefe…

…tch property Fixes #5877 - loadPage Cannot read property 'prefetch' of undefined and addresses execption from #5951

Conflicts:
	js/jquery.mobile.navigation.js
  • Loading branch information...
commit 3c53106c7a9c5d778dcf75364178f90b4cee315b 1 parent 9ac46ef
@arschmitz arschmitz authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 js/jquery.mobile.navigation.js
View
6 js/jquery.mobile.navigation.js
@@ -499,8 +499,8 @@ define( [
};
}
// Reset base to the default document base.
- // only reset if we are not prefetching
- if ( base && typeof options.prefetch === "undefined" ) {
+ // only reset if we are not prefetching
+ if ( base && ( typeof options === "undefined" || typeof options.prefetch === "undefined" ) ) {
base.reset();
}
@@ -536,7 +536,7 @@ define( [
url = fileUrl = path.getFilePath( $( "<div>" + RegExp.$1 + "</div>" ).text() );
}
//dont update the base tag if we are prefetching
- if ( base && typeof options.prefetch === "undefined") {
+ if ( base && ( typeof options === "undefined" || typeof options.prefetch === "undefined" )) {
base.set( fileUrl );
}
Please sign in to comment.
Something went wrong with that request. Please try again.