Skip to content

[MIG] website_anchor_smooth_scroll: Migration to 11.0 - #407

Merged
yajo merged 5 commits into
OCA:11.0from
njeudy:11-mig-website_anchor_smooth_scroll
Jan 29, 2018
Merged

yajo merged 5 commits into
OCA:11.0from
njeudy:11-mig-website_anchor_smooth_scroll

Conversation

@njeudy

@njeudy njeudy commented Jan 11, 2018

Copy link
Copy Markdown

No description provided.

@oca-clabot

Copy link
Copy Markdown

Hey @njeudy, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/website.cla
Here is a list of the users:

  • Alexandre Díaz (no github login found)

Appreciation of efforts,
OCA CLAbot

@njeudy njeudy mentioned this pull request Jan 11, 2018
38 tasks
@pedrobaeza pedrobaeza added this to the 11.0 milestone Jan 11, 2018
@pedrobaeza

Copy link
Copy Markdown
Member

Can you please squash together "OCA Transbot..." + "[FIX] Remove en.po..." commits. Ref: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from 116f9f2 to 430981e Compare January 11, 2018 16:54
@njeudy

njeudy commented Jan 11, 2018

Copy link
Copy Markdown
Author

@pedrobaeza yes it is done .. I also simplified history

' smooth scroll',
'version': '11.0.1.0.0',
'category': 'Website',
'website': 'http://www.antiun.com',

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pedrobaeza need I put oca website ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New rule is to put github repository url (https://github.com/OCA/website)

@@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
# © 2016 Antiun Ingeniería S.L. - Jairo Llopis

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pedrobaeza is this line needed I don't now if it could be delete or not, or if we need to add all contributors.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea is to collect here all the contributors, and when touched, on the respective files.

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch 2 times, most recently from 40c25b6 to c9d8fde Compare January 11, 2018 17:02
@pedrobaeza

Copy link
Copy Markdown
Member

But I see that you have removed totally Transbot commits. You shouldn't do that, but let only one.

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from c9d8fde to d09f5e2 Compare January 11, 2018 17:06
@njeudy

njeudy commented Jan 11, 2018

Copy link
Copy Markdown
Author

@pedrobaeza I squash transbot file with 8.0 commit , 10.0 commit .. I did not drop them

I just keep all authors, and squash commit with transbot that are in relation.

@pedrobaeza

Copy link
Copy Markdown
Member

I'm seeing now only 3 commits, but no trace of any "OCA Transbot..." commit. It should be at least one, result of squashing together all the previous ones.

@njeudy

njeudy commented Jan 11, 2018

Copy link
Copy Markdown
Author

@pedrobaeza yes, look at [8.0][website_anchor_smooth_scroll] Smooth scrolling on anchors. you have transbot file squashed in. and idem for [MIG] website_anchor_smooth_scroll: Migration to 10.0

I can do differently but as we only want to have clean history I think it can be better like this ..

@pedrobaeza

Copy link
Copy Markdown
Member

Yeah, but we shouldn't clean that way. Translations should be kept apart and with "OCA Transbot" identity, or all the lines of diff will be attributed to the person who makes the translation on the future contributor stats, which is not correct.

@njeudy

njeudy commented Jan 11, 2018

Copy link
Copy Markdown
Author

ok I will rebase with transbot commit ...

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from d09f5e2 to da48a28 Compare January 11, 2018 19:06
@njeudy

njeudy commented Jan 11, 2018

Copy link
Copy Markdown
Author

@pedrobaeza ok done :) clean rebase.

@njeudy njeudy changed the title WIP : [MIG] website_anchor_smooth_scroll: Migration to 11.0 [MIG] website_anchor_smooth_scroll: Migration to 11.0 Jan 11, 2018
@pedrobaeza

Copy link
Copy Markdown
Member

Trying on runbot the demo page "Anchor smooth scroll demo", images that were available in previous version aren't now. Can you please change then for proper test?

@pedrobaeza
pedrobaeza force-pushed the 11-mig-website_anchor_smooth_scroll branch 3 times, most recently from e0d83cc to f95321d Compare January 12, 2018 15:26
@pedrobaeza

Copy link
Copy Markdown
Member

I have cleaned a bit more the commits, because the first 2 are from the same author, and the renaming plus installable=False are not of significance.

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch 2 times, most recently from 1343af8 to 1d618cb Compare January 12, 2018 20:50
@njeudy

njeudy commented Jan 13, 2018

Copy link
Copy Markdown
Author

@pedrobaeza done !

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from 1d618cb to d9c8592 Compare January 14, 2018 22:34
@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from d9c8592 to 87b6bd8 Compare January 15, 2018 15:33
@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from 87b6bd8 to ec5df2d Compare January 23, 2018 15:17
@njeudy

njeudy commented Jan 23, 2018

Copy link
Copy Markdown
Author

@pedrobaeza can you explain me why runbot is red ? find no errors ..

@njeudy

njeudy commented Jan 24, 2018

Copy link
Copy Markdown
Author

@simahawk @yajo could you review this one in same times ? :)

@simahawk

Copy link
Copy Markdown

@njeudy can you review your PR 1st? README and manifest need the usual fixes

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch 2 times, most recently from 5ddbd18 to ac69f7a Compare January 25, 2018 08:32
@njeudy

njeudy commented Jan 25, 2018

Copy link
Copy Markdown
Author

@simahawk found wrong website url in manifest but did not catch problems in README.

Sorry if I mess something ..

if (event.target.hash != "") {
var target = $(event.target.hash);
return $('html, body')
.stop()

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not blocking but these lines should be indented under the return statement

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok done, you're right :)

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from ac69f7a to 846a2e7 Compare January 25, 2018 10:42
Comment thread website_anchor_smooth_scroll/README.rst Outdated
Configuration
=============

No configuration needed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can drop the configuration section then

Comment thread website_anchor_smooth_scroll/README.rst Outdated
Funders
-------

None

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, empty sections can be dropped

* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
odoo.define('website_anchor_smooth_scroll.website_anchor_smooth_scroll', function (require) {

require('web.dom_ready');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not put anything before "use strict" or it has no meaning. Besides, this call must appear above 1st dom modifications, not here.

}

(function ($) {
$(document).ready(function () {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just put the require('web.dom_ready'); line above this and remove this callback.

yajo and others added 4 commits January 26, 2018 12:35
@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch 2 times, most recently from 6ca1160 to 3a5afe5 Compare January 26, 2018 12:54
@njeudy

njeudy commented Jan 26, 2018

Copy link
Copy Markdown
Author

@yajo ok thank for the review, changes done.

// Apply to all links that start with `#`
$("a[href^='#']").live("click", website_anchor_smooth_scroll);
})(jQuery);
$("a[href^='#']:not([href=#])").on("click", website_anchor_smooth_scroll);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is being declared but never executed, just execute this line, without wrapping it in a function please 😊

@njeudy
njeudy force-pushed the 11-mig-website_anchor_smooth_scroll branch from 3a5afe5 to 0a665f8 Compare January 27, 2018 17:22
@njeudy

njeudy commented Jan 27, 2018

Copy link
Copy Markdown
Author

@yajo ok done, thanks a lot for review it helps me a lot .. and give really clean code :)

@yajo yajo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks to you @njeudy. BTW on successive reviews it's good to add one !fixup commit on top of the last one instead of ammending. It helps the reviewier to concentrate on the new diff rather than reviewing again all the change. Then, after the final OK is given, you squash it and we merge it.

Well, in any case it's OK now. Merging.

@yajo
yajo merged commit efdbd02 into OCA:11.0 Jan 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants