On Wed, 07 Mar 2012, Javier Martin Montull wrote: > On 03/05/2012 02:18 PM, Tibor Simko wrote: >> 1) jQuery >> >> next's jQuery version is 1.5; all the dependencies were put to live in >> the dedicated /js/jquery/ name space; however, some dependencies (like >> flot) were left out and need to be completed. >> >> master's jQuery version is 1.7, uses the usual /js/ name space, and the >> list of dependencies is complete. >> >> The dotted name space like `jquery.hotkeys.js' seems sufficient to me to >> single out jQuery dependencies, so I would propose to simply kill next's >> changes related to jQuery and to replace them fully with master's >> version, amending the paths and whatnot back to what is used in master. >> >> OK with you? If so, we could take care of this here. > > Yes, that's fine with me.
Done, see 74bfb5a. >> 2) BibEdit >> >> Piotr started re-factoring BibEdit in the next branch many moons ago, >> including holding pen updates, JS clean up, CSS split up, bibedit cache, >> and stuff. (See also<http://invenio-software.org/ticket/792>.) >> Meanwhile, you have introduced many new BibEdit features into master. >> In order to sync the two versions, dunno how many of Piotr's changes >> would you like to keep and in what form? Shall we take master's version >> of BibEdit and put it onto next as part of the jQuery update, overriding >> next's changes, meaning that you would then have to re-apply some parts >> from Piotr's work in the future? Or shall we test-merge master's >> BibEdit onto next's BibEdit, solving any jQuery and other related mega >> conflicts on the go, as we usually did in the past? Please advise what >> would you prefer. >> > > Yes, I would go for the option of taking master's version and > overriding Next. I will make sure to keep Piotr's branches in my > personal repository so that I can take from there any commits that > might be eventually useful. Especially from the following commits: abdbc6b BibEdit: fix apply all HP changes, Piotr Praczyk, 1 year, 4 months ago 4365321 BibEdit: clean JavaScript code, Piotr Praczyk, 1 year, 4 months ago 877c7a2 BibEdit: extract css into a separate file, Piotr Praczyk, 1 year, 4 months ago 3d67a78 BibEdit: upgrade to jQuery 1.5, Piotr Praczyk, 1 year, 4 months ago Note that the holding pen changes may be useful for `master' in order to make its UI working there as well, as I mentioned in the commit log of 74bfb5a. Best regards -- Tibor Simko
