Skip to content
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

Jump to bottom

fix(livereload): wrong usage of reject, meant resolve. #167

Merged
merged 9 commits into from
Jul 4, 2018
Merged

fix(livereload): wrong usage of reject, meant resolve. #167

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
79f8f3d
fix(wkwebview): Images not loading in Ionic WKWebView
eduardoRoth Jun 17, 2018
fc00969
Merge pull request #1 from eduardoRoth/eduardoRoth-patch-ios-ionicwkw…
eduardoRoth Jun 17, 2018
367f674
fix(livereload): Images not loading
eduardoRoth Jun 19, 2018
e12f4a6
Merge pull request #2 from eduardoRoth/eduardoRoth-fix-livereload
eduardoRoth Jun 19, 2018
fd23fe5
Merge branch 'master' into pr/3
eduardoRoth Jun 19, 2018
94b3b29
Merge pull request #4 from eduardoRoth/pr/3
eduardoRoth Jun 19, 2018
5b5ccd1
lint(livereload): Updated for ihadeed comments
eduardoRoth Jun 25, 2018
0e8c948
Merge pull request #5 from zyra/master
eduardoRoth Jul 2, 2018
f4b5bd2
fix(livereload): Using reject instead of resolve
eduardoRoth Jul 2, 2018
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
2 changes: 1 addition & 1 deletion src/providers/image-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ export class ImageLoader {

// if we're running with livereload, ignore cache and call the resource from it's URL
if(this.isDevServer){
return reject();
return resolve(url);
}

// get file name
Expand Down