js-shield
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merge of website-dev to devel0.7


From: Ricardo Lafuente
Subject: Re: Merge of website-dev to devel0.7
Date: Mon, 21 Feb 2022 15:20:58 +0000

Oh no, I'm sorry for causing this extra hassle. My editor was set up for auto-lint, and while I tried to keep the style changes from the commits, the NP wrapper file went in without me noticing.

I'll do my best to keep any junk from going through again.

On 2/21/22 15:05, Libor Polčák wrote:
Hello,

I merged website-dev to devel 0.7 as the Friday meeting showed progress and I expect that the website will be generated soon from this branch.

However, I needed to remove a big part of https://pagure.io/JShelter/webextension/c/03eed77d66cf568f1c0d179464e07995ea9bea5b?branch=devel0.7

The commit is titled: "Additional wrapper doc edits", yet it removed 265 lines of  common/wrappingS-NP.js  and added 256 lines. Most of these consisted code lines. It seems that the majority of the changes is coding-style and concerns white space edits. This is not what the commit title says. It caused conflicts with different code already merged to devel0.7.

Ricardo, can you have a look if it is necessary to modify common/wrappingS-NP.js from devel0.7. If it is, can you provide a single commit that clearly says that it is about white space changes and other coding style changes?

Thank you,

Libor

Hello,

I noticed that there are issues with some code from the website-dev branch:

15:16:36.501
Uncaught ReferenceError: item is not defined
    <anonymous> moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/wrappingS-NP.js:260     <anonymous> moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/wrappingS-NP.js:340
wrappingS-NP.js:260:16
15:16:36.620
TypeError: wrapper is undefined
    build_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:241     build moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:357     code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     wrap_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     updateLevels moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/levels.js:707
code_builders.js:359:12
15:16:36.636
TypeError: undefined has no properties
    build_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:241     build moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:357     code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     wrap_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     updateLevels moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/levels.js:707
code_builders.js:359:12
15:16:36.739
TypeError: undefined has no properties
    build_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:241     build moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:357     code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     wrap_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     updateLevels moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/levels.js:707     promise callback*changedLevels moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/levels.js:749
code_builders.js:359:12
15:16:36.749
TypeError: undefined has no properties
    build_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:241     build moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:357     code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     wrap_code moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/code_builders.js:649     updateLevels moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/levels.js:707     promise callback*changedLevels moz-extension://5bf232d3-e256-4920-9503-eb5cc6b14455/levels.js:749
code_builders.js:359:12


So I forced push another series of commits. I tried to integrate as much as possible and meaningful from the website-dev branch.


b32bd47 Ignore generated wrapper markdown files
Split into 4a34efd and 15a79ce

dc2839b Fix markdown formatting
Already present as 0cab9cc2

1f0a7f6 Support \see tags from doxygen
485fc8d Fix \see and \bug rendering
39d0d64 Fix \see rendering
Squashed into b7b7072db3fc31c30c560f60f1ee6b8fec9af55b

dc9b0c5 Add base script for generating site versions (WIP)
Ignored due to WIP

3a652c6 Some wrapper docstring edits for better reading and style consistency
03eed77 Additional wrapper doc edits
43fe381 More wrapper edits
All three squashed into d462d78148fb612d5657c7bf801508935d1f077f

ece45e1 Quick wrapper doc edit
This modififed an autogenerated file, not sure why this was in the tree

d8fdb8f Fix \bug rendering on website
485fc8d Fix \see and \bug rendering
Both squashed into a3bb694180d8838fb0bcd7df513cbd23d9cf5fa1

94cecfe Fix sidebar active page for wrapper pages
2b6e03b1e7322255f07da2ddca8d721cca3c6d95

fb5ef81 Add explicit Atom link
6d81d1354a36b15e7473907c4022fe6f2ec8c70c

837944a Fixes for dark-theme
a242f3f

Please create a new branch on top of devel0.7 for additional development.

Thanks

Libor




reply via email to

[Prev in Thread] Current Thread [Next in Thread]