[Laszlo-dev] [Laszlo-checkins] r13347 - in openlaszlo/branches/4.2: . WEB-INF/lps/lfc/kernel/dhtml

P T Withington ptw at pobox.com
Wed Mar 18 15:18:55 PDT 2009 

Gack. That is a long way to go. I'd almost suggest developing a  
separate fix for branches that far apart. It's liable to be safer than  
trying to reconcile a messy merge.

On Mar 18, 2009, at 18:04, Max Carlson <max at openlaszlo.org> wrote:

> Tell me about it!  I'm in annoying editland right now - I'm currently
> hand-merging a slew of changes from 4.0.x to trunk!
>
> P T Withington wrote:
>> Yes, please try _not_ to use that if at all possible.
>>
>> Sometimes after a merge you will have to m-X copyright-update by hand
>> (because the rev that changed the copyright was not chosen for
>> integration). That's just one of the annoying hand edits you  
>> sometimes
>> have to make when integrating piecemeal.
>>
>> On Mar 18, 2009, at 17:09, Max Carlson <max at openlaszlo.org> wrote:
>>
>>> Why the skip-pre-commit-checks? It's caused problems in the past  
>>> with
>>> broken builds...
>>>
>>> hqm at openlaszlo.org wrote:
>>>> Author: hqm
>>>> Date: 2009-03-18 12:49:53 -0700 (Wed, 18 Mar 2009)
>>>> New Revision: 13347
>>>>
>>>> Modified:
>>>>  openlaszlo/branches/4.2/
>>>>  openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
>>>>  openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzTextSprite.js
>>>> Log:
>>>> Merged revisions 13128 via svnmerge from
>>>> http://svn.openlaszlo.org/openlaszlo/trunk
>>>>
>>>> .......
>>>> r13128 | bargull | 2009-03-02 19:38:11 -0500 (Mon, 02 Mar 2009) |
>>>> 26 lines
>>>>
>>>> Change 20090303-bargull-Tb7 by bargull at dell--p4--2-53 on
>>>> 2009-03-03 00:45:33
>>>>     in /home/Admin/src/svn/openlaszlo/trunk
>>>>     for http://svn.openlaszlo.org/openlaszlo/trunk
>>>>
>>>> Summary: DHTML: add css-style for textlink
>>>>
>>>> skip-pre-commit-checks
>>>>
>>>> New Features:
>>>>
>>>> Bugs Fixed: LPP-7551 (partial)
>>>>
>>>> Technical Reviewer: hminsky
>>>> QA Reviewer: (pending)
>>>> Doc Reviewer: (pending)
>>>>
>>>> Documentation:
>>>>
>>>> Release Notes:
>>>>
>>>> Details:
>>>> Added new css-style for textlinks ("lztextlink") and applied to
>>>> span in LzTextSprite.prototype.makeTextLink
>>>>
>>>>
>>>> Tests:
>>>> testcase from bugreport in dhtml
>>>> .......
>>>>
>>>>
>>>>
>>>> Property changes on: openlaszlo/branches/4.2
>>>> ___________________________________________________________________
>>>> Name: svnmerge-integrated
>>>>  - /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:
>>>> 1-8432 /openlaszlo/branches/pagan-deities:
>>>> 1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /
>>>> openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /
>>>> openlaszlo/branches/wafflecone:
>>>> 1-5
>>>> 746,5818-
>>>> 6068,6070-
>>>> 6205,6207-
>>>> 6213,6216-
>>>> 6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /
>>>> openlaszlo/trunk:
>>>> 1-1
>>>> 2154,12172-
>>>> 12175,12177-
>>>> 12185,12187-
>>>> 12194,12196,12201,12208,12229,12251-
>>>> 12252,12254-
>>>> 12255,12257-
>>>> 12258,12260,12262-
>>>> 12266,12268-
>>>> 12269,12271-
>>>> 12275,12278-
>>>> 12285,12303,12318-
>>>> 12323,12340-
>>>> 12348,12352,12354-
>>>> 12358,12360-
>>>> 12361,12363,12365-
>>>> 12367,12369-
>>>> 12371,12375-
>>>> 12378,12380-
>>>> 12389,12391,12394-
>>>> 12396,12399-
>>>> 12400,12402-
>>>> 12403,12406-
>>>> 12416,12419-
>>>> 12422,12424-
>>>> 12429,12431-
>>>> 12433,12435,12437-
>>>> 12441,12443,12445,12447,12449-
>>>> 12451,12453-
>>>> 12454,12457-
>>>> 12460,12464,12466-
>>>> 12475,12477-
>>>> 12480,12482-
>>>> 12490,12493-
>>>> 12495,12499-
>>>> 12502,12507-
>>>> 12510,12512,12514-
>>>> 12520,12522,12525- 
>>>> 12531,12534-12540,12542,12545,12548-12554,12557-125
>>> 6!
>>>> 1,1
>>>> 2564,12566-
>>>> 12568,12571,12574-
>>>> 12576,12578,12580,12583-
>>>> 12584,12586-
>>>> 12587,12589,12592-
>>>> 12596,12598-
>>>> 12600,12602-
>>>> 12609,12611-
>>>> 12615,12617,12619-
>>>> 12621,12623,12625,12628-
>>>> 12631,12633-
>>>> 12635,12637,12639,12642,12644,12647-
>>>> 12653,12656,12658,12660,12662-
>>>> 12666,12668-
>>>> 12694,12696,12698-
>>>> 12704,12708-
>>>> 12710,12712-
>>>> 12721,12723-
>>>> 12729,12731-
>>>> 12742,12745-
>>>> 12752,12754-
>>>> 12784,12786-
>>>> 12791,12793-
>>>> 12798,12800-
>>>> 12801,12803,12805-
>>>> 12808,12810-
>>>> 12812,12814,12816-
>>>> 12821,12825-
>>>> 12833,12835-
>>>> 12837,12839-
>>>> 12841,12847,12849-
>>>> 12859,12863-
>>>> 12883,12885-
>>>> 12895,12897-
>>>> 12906,12908-
>>>> 12915,12917-
>>>> 12922,12924-
>>>> 12934,12937-
>>>> 12940,12943-
>>>> 12944,12946-
>>>> 12947,12950-
>>>> 12952,12955-
>>>> 12964,12966-
>>>> 12969,12971,12973-
>>>> 12977,12979-
>>>> 12993,12997-
>>>> 12999,13001-
>>>> 13003,13006-
>>>> 13007,13010-
>>>> 13015,13017-
>>>> 13020,13022-
>>>> 13024,13026-
>>>> 13031,13033,13035-
>>>> 13037,13039-
>>>> 13040,13043,13046-
>>>> 13052,13055-
>>>> 13060,13062-
>>>> 13069,13071-
>>>> 13072,13074,13076-
>>>> 13085,13087-
>>>> 13093,13095-
>>>> 13101,13103-
>>>> 13104,13106,13108-
>>>> 13110,13112,13114-
>>>> 13122,13125-
>>>> 13126,13129,13132-13136,13139-13140,13142,13147,13157-13158,1
>>> 3!
>>>> 163,13167,13176,13186,13188,13195,13200,13225,13243
>>>>  + /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:
>>>> 1-8432 /openlaszlo/branches/pagan-deities:
>>>> 1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /
>>>> openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /
>>>> openlaszlo/branches/wafflecone:
>>>> 1-5
>>>> 746,5818-
>>>> 6068,6070-
>>>> 6205,6207-
>>>> 6213,6216-
>>>> 6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /
>>>> openlaszlo/trunk:
>>>> 1-1
>>>> 2154,12172-
>>>> 12175,12177-
>>>> 12185,12187-
>>>> 12194,12196,12201,12208,12229,12251-
>>>> 12252,12254-
>>>> 12255,12257-
>>>> 12258,12260,12262-
>>>> 12266,12268-
>>>> 12269,12271-
>>>> 12275,12278-
>>>> 12285,12303,12318-
>>>> 12323,12340-
>>>> 12348,12352,12354-
>>>> 12358,12360-
>>>> 12361,12363,12365-
>>>> 12367,12369-
>>>> 12371,12375-
>>>> 12378,12380-
>>>> 12389,12391,12394-
>>>> 12396,12399-
>>>> 12400,12402-
>>>> 12403,12406-
>>>> 12416,12419-
>>>> 12422,12424-
>>>> 12429,12431-
>>>> 12433,12435,12437-
>>>> 12441,12443,12445,12447,12449-
>>>> 12451,12453-
>>>> 12454,12457-
>>>> 12460,12464,12466-
>>>> 12475,12477-
>>>> 12480,12482-
>>>> 12490,12493-
>>>> 12495,12499-
>>>> 12502,12507-
>>>> 12510,12512,12514-
>>>> 12520,12522,12525- 
>>>> 12531,12534-12540,12542,12545,12548-12554,12557-125
>>> 6!
>>>> 1,1
>>>> 2564,12566-
>>>> 12568,12571,12574-
>>>> 12576,12578,12580,12583-
>>>> 12584,12586-
>>>> 12587,12589,12592-
>>>> 12596,12598-
>>>> 12600,12602-
>>>> 12609,12611-
>>>> 12615,12617,12619-
>>>> 12621,12623,12625,12628-
>>>> 12631,12633-
>>>> 12635,12637,12639,12642,12644,12647-
>>>> 12653,12656,12658,12660,12662-
>>>> 12666,12668-
>>>> 12694,12696,12698-
>>>> 12704,12708-
>>>> 12710,12712-
>>>> 12721,12723-
>>>> 12729,12731-
>>>> 12742,12745-
>>>> 12752,12754-
>>>> 12784,12786-
>>>> 12791,12793-
>>>> 12798,12800-
>>>> 12801,12803,12805-
>>>> 12808,12810-
>>>> 12812,12814,12816-
>>>> 12821,12825-
>>>> 12833,12835-
>>>> 12837,12839-
>>>> 12841,12847,12849-
>>>> 12859,12863-
>>>> 12883,12885-
>>>> 12895,12897-
>>>> 12906,12908-
>>>> 12915,12917-
>>>> 12922,12924-
>>>> 12934,12937-
>>>> 12940,12943-
>>>> 12944,12946-
>>>> 12947,12950-
>>>> 12952,12955-
>>>> 12964,12966-
>>>> 12969,12971,12973-
>>>> 12977,12979-
>>>> 12993,12997-
>>>> 12999,13001-
>>>> 13003,13006-
>>>> 13007,13010-
>>>> 13015,13017-
>>>> 13020,13022-
>>>> 13024,13026-
>>>> 13031,13033,13035-
>>>> 13037,13039-
>>>> 13040,13043,13046-
>>>> 13052,13055-
>>>> 13060,13062-
>>>> 13069,13071-
>>>> 13072,13074,13076-
>>>> 13085,13087-
>>>> 13093,13095-
>>>> 13101,13103-
>>>> 13104,13106,13108-
>>>> 13110,13112,13114-
>>>> 13122,13125-
>>>> 13126,13128-13129,13132-13136,13139-13140,13142,13147,13157-1
>>> 3!
>>>> 158,13163,13167,13176,13186,13188,13195,13200,13225,13243
>>>>
>>>> Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzSprite.js
>>>> ===================================================================
>>>> --- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzSprite.js    2009-03-18 19:21:29 UTC (rev 13346)
>>>> +++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzSprite.js    2009-03-18 19:49:53 UTC (rev 13347)
>>>> @@ -242,6 +242,9 @@
>>>>        letterSpacing: '0px',
>>>>        textDecoration: 'none'
>>>>    },
>>>> +    lztextlink: {
>>>> +        cursor: 'pointer'
>>>> +    },
>>>>    writeCSS: function() {
>>>>        var css = '';
>>>>        for (var classname in this) {
>>>>
>>>> Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzTextSprite.js
>>>> ===================================================================
>>>> --- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzTextSprite.js    2009-03-18 19:21:29 UTC (rev 13346)
>>>> +++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/
>>>> LzTextSprite.js    2009-03-18 19:49:53 UTC (rev 13347)
>>>> @@ -466,7 +466,7 @@
>>>> LzTextSprite.prototype.makeTextLink = function (str, value) {
>>>>    LzTextSprite.addLinkID(this.owner);
>>>>    var uid = this.owner.getUID();
>>>> -    return "<span onclick=\"javascript:
>>>> $modules.lz.__callTextLink('" + uid+"', '" + value +"')\">" + str
>>>> +"</span>";
>>>> +    return "<span class=\"lztextlink\" onclick=\"javascript:
>>>> $modules.lz.__callTextLink('" + uid+"', '" + value +"')\">" + str
>>>> +"</span>";
>>>> }
>>>>
>>>> // value is encoded as VIEWID:value
>>>>
>>>>
>>>> _______________________________________________
>>>> Laszlo-checkins mailing list
>>>> Laszlo-checkins at openlaszlo.org
>>>> http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
>>> -- 
>>> Regards,
>>> Max Carlson
>>> OpenLaszlo.org
>>>
>>> _______________________________________________
>>> Laszlo-checkins mailing list
>>> Laszlo-checkins at openlaszlo.org
>>> http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
>>
>> _______________________________________________
>> Laszlo-checkins mailing list
>> Laszlo-checkins at openlaszlo.org
>> http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
>
> -- 
> Regards,
> Max Carlson
> OpenLaszlo.org
>
> _______________________________________________
> Laszlo-checkins mailing list
> Laszlo-checkins at openlaszlo.org
> http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

More information about the Laszlo-dev mailing list