search

jaunesarmiento / fries

Fries helps you prototype Android apps using HTML, CSS, and JavaScript.
MIT License
1.55k stars 222 forks source link

Clean wip/v2.1.0 branch #94

Closed eyecatchup closed 10 years ago

eyecatchup commented 10 years ago

Resolved conflicts and merged everything into a new branch. These branches can be automatically merged now. :)

jaunesarmiento commented 10 years ago

I've just confirmed that the latest fingerblast.js and fixes done to example.js and documentation.js broke the dialogs and toast notifications. Can you have a look at this on your end?

eyecatchup commented 10 years ago

checking

update: it's not fingerblast. it's the changes I made here

  // sometimes Android returns a width and height of zero..
  // so we wait 10ms and try again.
  // (Taken from Google's internal dots framework file webview.js)
  var w = document.documentElement.clientWidth || document.body.clientWidth;
  if ('undefined' === typeof w || w == 0) {
    setTimeout(function() {
       // do stuff
    }, 10);
    return;
  }

commiting a fix in a sec

eyecatchup commented 10 years ago

Added https://github.com/eyecatchup/fries/commit/ac0fd82d3803fd19a181be469d2750e53a65c2d2 to the PR which should fix the broken scripts At least it does on my side. Can you confirm that?

jaunesarmiento commented 10 years ago

Awesome! Thanks!

eyecatchup commented 10 years ago

Glad that's solved. :+1:

Okay your wip/v2.1.0 branch is clean now and includes all recent updates as well as both themes. It is right now 11 commits ahead and 2 commits behind your new develop and the master branch (master and develop are on pair atm).

So, should I keep sending send new PRs to wip/v2.1.0 or, as previously said, to the new develop branch? Because actually develop branch is useless right now, isn't it?

jaunesarmiento commented 10 years ago

Yes, develop is pretty much useless right now. I think deleting that branch is fine.

Just send your pull requests to wip/v2.1.0. On Mar 13, 2014 4:55 AM, "Stephan Schmitz" notifications@github.com wrote:

Glad that's solved. [image: :+1:]

Okay your wip/v2.1.0 branch is the clean now and includes all recent updates as well as both themes. It is right now 11 commits ahead and 2 commits behind your new develop branch.

So, should I keep sending send new PRs to wip/v2.1.0 or, as previously said, to the new develop branch? Because actually develop branch is useless right now, isn't it?

Reply to this email directly or view it on GitHubhttps://github.com/jaunesarmiento/fries/pull/94#issuecomment-37463787 .