Changeset 1892


Ignore:
Timestamp:
2011-04-19 11:32:44 (13 months ago)
Author:
mpo
Message:

updates for jquery and jquery.ui

Location:
trunk/modules/kauri-jquery/src
Files:
26 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/modules/kauri-jquery/src/main/kauri/conf/general.xml

    r1509 r1892  
    22<!-- Set off general parameters --> 
    33<conf> 
    4   <jquery        version="1.4.2" /> 
    5   <jquery.ui     version="1.8"     theme="smoothness" /> 
     4  <jquery        version="1.5.2" /> 
     5  <jquery.ui     version="1.8.11"     theme="smoothness" /> 
    66  <jquery.cookie version="1.0" />   
    77</conf> 

  • trunk/modules/kauri-jquery/src/test/kauri.util/test-core.js

    r1182 r1892  
     1$(document).ready(function() { 
    12module('Core Variable Testing'); 
    23 
    … …  
    134135    ok(time < exp, "fast enough routine -- " + time); 
    135136} 
     137 
     138}); 

  • trunk/modules/kauri-jquery/src/test/kauri.util/test-locale.js

    r1182 r1892  
     1$(document).ready(function() { 
     2 
    13// actual tests 
    24module('Locale testing.'); 
    … …  
    1315 
    1416    // TODO redo when actual i18n lookup is completed 
    15         msg = kf.Message.build("i18n:not.found", [ 'infill' ]); 
    16         equals("not.found", msg.getText(), "i18n msg test."); 
     17    msg = kf.Message.build("i18n:not.found", [ 'infill' ]); 
     18    equals("not.found", msg.getText(), "i18n msg test."); 
    1719 
    18     }); 
     20}); 
     21 
     22}); 

  • trunk/modules/kauri-jquery/src/test/kauri.util/test-uritemplate.js

    r1871 r1892  
     1$(document).ready(function() { 
     2 
    13module('Template URI Testing'); 
    24 
    … …  
    280282}); 
    281283 
     284}); 
     285 
    282286 
    283287function uriTests( data, set) { 
    … …  
    297301    } 
    298302} 
     303 

  • trunk/modules/kauri-jquery/src/test/kauri.util/testPage.html

    r1436 r1892  
    44  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    55  <title>Kauri JQuery Main Test Page</title> 
    6   <link rel="Stylesheet" media="screen" href="../qunit/testsuite.css" /> 
    7   <script type="text/javascript" src="../../main/kauri/static/jquery/jquery-1.4.1/jquery-1.4.1.js"></script> 
    8   <script type="text/javascript" src="../qunit/testrunner.js"></script> 
     6  <link rel="Stylesheet" media="screen" href="../qunit/qunit.css" /> 
     7  <script type="text/javascript" src="../../main/kauri/static/jquery/jquery-1.5.2/jquery-1.5.2.js"></script> 
     8  <script type="text/javascript" src="../qunit/qunit.js"></script> 
    99       
    1010  <!--  CODE UNDER TEST  --> 
    … …  
    1616  <!-- INCLUDE TESTS HERE --> 
    1717  <script type="text/javascript"> 
     18    function sameJq(first, second, msg) { 
     19        if (first == null || second == null || first.length != second.length) 
     20            fail(msg); 
     21        for (var i=0; i<first.length; i++) 
     22            if (first.get(i) != second.get(i)) 
     23                fail(msg + " -- not same @index=" + i); 
     24        ok(true, msg); 
     25    }; 
     26 
    1827    //tests assume some standard locale setting 
    1928    //we override those! 
    20     ; 
     29 
    2130    (function($){ 
    2231        var locale = $.org.kauriproject.forms.locale; 
    … …  
    2534        locale.separator['1000'] = ','; 
    2635        locale.timezone = 0; 
    27     })(jQuery);     
     36    })(jQuery); 
     37 
    2838  </script> 
    2939  <script type="text/javascript" src="test-core.js" ></script> 
    30   <!--  TODO introduce a json2 test, even if it's not our code it would show how to use it. --> 
    3140  <script type="text/javascript" src="test-uritemplate.js" ></script> 
    3241  <script type="text/javascript" src="test-locale.js" ></script> 
    … …  
    3544 
    3645<body id="body"> 
    37   <h1 id="header">Kauri JQuery Test Page</h1> 
    38   <h2 id="banner"></h2> 
    39   <h2 id="userAgent"></h2> 
     46  <h1 id="qunit-header">Kauri JQuery Test Page</h1> 
     47  <h2 id="qunit-banner"></h2> 
     48  <div id="qunit-testrunner-toolbar"></div> 
     49  <h2 id="qunit-userAgent"></h2> 
     50   
     51  <!-- Test HTML --> 
     52  <div id="main" style="display: none;"></div> 
    4053 
    41   <!-- Test HTML --> 
    42   <div id="main" style="display: none;"> 
    43  
    44   </div> 
     54  <ol id="qunit-tests"></ol> 
     55  <div id="qunit-fixture">test markup, will be hidden</div> 
    4556  <ol id="tests"></ol> 
    4657</body> 
Note: See TracChangeset for help on using the changeset viewer.