-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Add Cordova build target #3
Conversation
f2cdc02
to
459665a
Compare
r? @gmarty Thanks for looking into the ES5 issue, that worked! :) |
d5a0448
to
a74105f
Compare
459665a
to
98f2b79
Compare
@@ -16,6 +16,7 @@ | |||
<link rel="icon" sizes="512x512" href="img/icons/512.png"> | |||
<meta name="application-name" content="Foxbox Client"> | |||
<title>Foxbox Client</title> | |||
<script type="text/javascript" src="cordova.js"></script> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is needed for the Cordova build; I added an empty app/cordova.js
file to the repo so that it won't error when using gulp
to serve the app on http://localhost:8000/. We should do this in a fancier way eventually, but I think for now it does the trick. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove the type="text/javascript"
attribute and add a defer
one, for the sake of consistency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
This PR looks good to me, but I think we should wait until the es5 issue is fixed in the MVC repo then we can just update the dependencies. This issue is being tracked at fxos-eng/sanitizer#3. Let's see how it goes. |
OK! Will merge it without the |
@@ -0,0 +1 @@ | |||
<!-- to be generated during Cordova build --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make it a regular comment? It seems that HTML style comments are not supported by Microsoft browsers.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah of course, this is a .js file, wrong comment style.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
09bf09c
to
b11a123
Compare
cordova platform add android | ||
cordova build android | ||
cordova emulate android | ||
``` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you think you can make this a gulp task in the gulpfile.js
instead?
The command to build would just have to be gulp cordova
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, will have a look at that!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. I couldn't merge gulp cordova-setup
and gulp cordova-android
into one task because the second has to run in a folder (dist/cordova
), which the first one creates. So I left it as two tasks, hope that's ok.
9c7a6c7
to
cef51be
Compare
Can we just merge it now and then iterate later? |
cordovaHTTP && cordovaHTTP.acceptHss) { | ||
this.supported = true; | ||
} else { | ||
this.supported = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this line read?
this.supported = false;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Fixed.
026c422
to
30df6bd
Compare
@gmarty addressed your latest review comments. |
Looks like
gulp
is building ES6 - should find out how to generate ES5 code.