Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Upgrade to jquery 10 #4681

Merged
merged 20 commits into from

6 participants

Fabian Rodriguez Jonne Haß goob Florian Staudacher Steffen van Bergerem Fla
Fabian Rodriguez
Collaborator

ok this is still a WIP, help is much appreciated :)

there are some things that are needed to be done:

  • $.browser was removed, it is recommended in the guides to use http://modernizr.com/ to know the browser but that's overkill imo. something like this should be enough... thoughts?

  • There is an issue with infinitescroll in the contacts page. in this line, changing jQuery.event.handle to jQuery.event.dispatch will do the trick but it's kind of hacky and probably the error is somewhere else because this works in the stream...

  • Test a lot, doing the workarounds mentioned above I was able to have specs and cukes green, but had some failures in jasmine... Probably there are some errors in the app that the tests don't cover :(

Jonne Haß
Owner

The $.browser workaround would be fine with me, of course the long term goal would be to get rid of browser special casing if possible.

goob

Thanks for working on this, Fabian. I was about to ask whether we should look to upgrade.

I see there's jQuery 2 as well, although that loses support for IE 6, 7 and 8. It's very tempting .... ;)

Florian Staudacher
Owner

@goobertron we've never really supported IE < 8 anyway, and IE 8 is getting abandoned as we speak (with support for Win XP ending soon...)

goob

If IE 8 is getting abandoned, can we drop Chrome Frame (the other call to googleapis.com apart from JQuery)?

Fabian Rodriguez
Collaborator

@Raven24 do you think you can give me a hand with the jasmine specs?

Florian Staudacher
Owner

sure, ...after this thursday :)

Jonne Haß jhass referenced this pull request
Closed

Updated Jquery-rails #4406

Florian Staudacher
Owner

alright, I rebased and fixed the search specs. more to come...

Steffen van Bergerem
Collaborator

How about using jquery-rails 3.1.0? I went through the changelog and it looks like an update could be done without any additional work.

Fabian Rodriguez
Collaborator

@Raven24 thanks for taking a look at this!

Florian Staudacher
Owner

@fabianrbz sure :)

... dafuq travis. it hates me. I can feel it

goob

@Raven24 :-) I feel your pain.

Florian Staudacher
Owner

yay, jasmine is happy. cucumber is next ...

Fabian Rodriguez
Collaborator

@Raven24 cool! about the cukes... that might be related to the captcha and the firefox's version travis is using... I remember having issues with that because the html5 validations that new browsers have. Captcha validation is not used in the test environment, but the field is still present. -All this is related to the fact that I removed client_side_validations, that's the reason why it doesn't fail in develop-

Florian Staudacher
Owner

ok, had to change a few cukes... it might work now ;)

Florian Staudacher
Owner

summoning @MrZYX ... any idea for a quick solution for this, maybe?
https://travis-ci.org/diaspora/diaspora/jobs/19392288#L499

Jonne Haß
Owner

Not the slightest. Iiirc I've the same one in the rails4 branch and hoped you would catch it :P

Florian Staudacher
Owner

hm, my guess is the locale is populated by an earlier test and the 'toEqual' matcher really checks equality in both directions ... so I'm trying clearing the locale for the test runs. Let's see what Travis thinks ;)

Jonne Haß
Owner

\o/ green travis? Ready to merge?

Steffen van Bergerem
Collaborator

quoting myself:

How about using jquery-rails 3.1.0? I went through the changelog and it looks like an update could be done without any additional work.

Florian Staudacher

note to self: indentation

Owner

:P

Florian Staudacher
Owner

I think this PR is already open long enough, and can be merged as is. the main objective is now done and if (hopefully) updating to jquery 11 (gem v3.1) really isn't a big deal, then a separate PR is just a formality.
The most important benefit from this - the actual upgrade of our code and the tests to jquery 10 - should make future jquery updates a breeze.

Steffen van Bergerem
Collaborator

@Raven24 Alright, thanks for your answer. :)

Jonne Haß
Owner

Alright, let's break stuff :P Thank you @Raven24 and @fabianrbz!

Jonne Haß jhass merged commit a2aff72 into from
Jonne Haß jhass added this to the next milestone
Florian Staudacher
Owner

as long as we don't do a release immediately we should be fine... ;)

Fabian Rodriguez
Collaborator

@Raven24 thanks! lots of :beers: for you!

Fla

Nice work guys! Should I merge this now, or should I wait to see what is happening on smaller pods? There are almost 500 persons on diaspora-fr now, so I'd like to avoid too big regressions...

Florian Staudacher
Owner

@Flaburgan well, the tests all pass so the basic functionality should be OK,
otoh, I just noticed a glitch in the publisher, where the mentions overlay is not where it's supposed to be... (on current develop HEAD)

Jonne Haß jhass deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 23, 2014
  1. Fabian Rodriguez Florian Staudacher

    removes unused and/or unnceseary js files:

    fabianrbz authored Raven24 committed
      *bootstrap-dropdown
      *bootstrap-modal
      *bootstrap-popover
      *bootstrap-transition
      *bootstratp-twipsy
      *jquery-ui-1.8.9.custom.min.js
    if we need the bootstrap files we should include them via the gem bootstrap-sass
  2. Fabian Rodriguez Florian Staudacher

    bump jquery-rails to 3.0.4

    fabianrbz authored Raven24 committed
  3. Fabian Rodriguez Florian Staudacher

    remove require if jquery-ui-1.8.9.custom.min

    fabianrbz authored Raven24 committed
  4. Fabian Rodriguez Florian Staudacher

    #live is no longer supported, use on instead

    fabianrbz authored Raven24 committed
  5. Fabian Rodriguez Florian Staudacher

    Removes client_side_validations

    fabianrbz authored Raven24 committed
    Conflicts:
    	Gemfile
    	Gemfile.lock
  6. Fabian Rodriguez Florian Staudacher

    remove aspect sorting logic

    fabianrbz authored Raven24 committed
  7. Fabian Rodriguez Florian Staudacher

    remove unused variable

    fabianrbz authored Raven24 committed
  8. Fabian Rodriguez Florian Staudacher

    remove comment, for the record, it was an arbitrary number picked due…

    fabianrbz authored Raven24 committed
    … to performance reasons
  9. Fabian Rodriguez Florian Staudacher

    #toggle was removed

    fabianrbz authored Raven24 committed
  10. Fabian Rodriguez Florian Staudacher

    add browser detection

    fabianrbz authored Raven24 committed
  11. Fabian Rodriguez Florian Staudacher

    fix infinitescroll in contacts pages

    fabianrbz authored Raven24 committed
  12. Florian Staudacher

    fix search specs

    Raven24 authored
  13. Florian Staudacher

    fix likes spec

    Raven24 authored
  14. Florian Staudacher
  15. Florian Staudacher
  16. Florian Staudacher

    try to appease CI

    Raven24 authored
  17. Florian Staudacher
  18. Florian Staudacher
  19. Florian Staudacher
  20. Florian Staudacher
Something went wrong with that request. Please try again.