2
0
Эх сурвалжийг харах

jQuery 1.12.3/2.2.3 support.
Regenerated extern using api.jquery.com v1.12.2.

Andy Li 9 жил өмнө
parent
commit
7d22f362a5

+ 1 - 1
extra/CHANGES.txt

@@ -15,7 +15,7 @@
 	flash : update flash externs to version 21
 	flash : update flash externs to version 21
 	hl : added HL target (interpreter and C output)
 	hl : added HL target (interpreter and C output)
 	lua: added lua target
 	lua: added lua target
-	js : introduced new jQuery extern (js.jquery.*) for jQuery 1.12.2 / 2.2.2 support. (#4377)
+	js : introduced new jQuery extern (js.jquery.*) for jQuery 1.12.3 / 2.2.3 support. (#4377)
 	js : introduced new SWFObject extern (js.swfobject.SWFObject) for SWFObject 2.3.20130521 (#4451)
 	js : introduced new SWFObject extern (js.swfobject.SWFObject) for SWFObject 2.3.20130521 (#4451)
 	js : added js.Lib.rethrow (#4551)
 	js : added js.Lib.rethrow (#4551)
 	cs/java : added -D fast_cast as an experimental feature to cleanup casts
 	cs/java : added -D fast_cast as an experimental feature to cleanup casts

+ 1 - 1
src/main.ml

@@ -1458,7 +1458,7 @@ try
 			"n"
 			"n"
 		| Js ->
 		| Js ->
 			if not (PMap.exists (fst (Define.infos Define.JqueryVer)) com.defines) then
 			if not (PMap.exists (fst (Define.infos Define.JqueryVer)) com.defines) then
-				Common.define_value com Define.JqueryVer "11202";
+				Common.define_value com Define.JqueryVer "11203";
 
 
 			let es_version =
 			let es_version =
 				try
 				try

+ 1 - 1
std/js/jquery/JQuery.hx

@@ -873,7 +873,7 @@ package js.jquery;
 		Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
 		Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
 	**/
 	**/
 	@:overload(function(value:Float):js.jquery.JQuery { })
 	@:overload(function(value:Float):js.jquery.JQuery { })
-	public function scrollTop():Int;
+	public function scrollTop():Float;
 	/**
 	/**
 		Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
 		Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
 	**/
 	**/

+ 1 - 1
tests/unit/unit-js.html

@@ -7,7 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="viewport" content="width=device-width, initial-scale=1">
     </head>
     </head>
     <body id="haxe:trace">
     <body id="haxe:trace">
-        <script type="text/javascript" src="//code.jquery.com/jquery-1.12.2.min.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/jquery-1.12.3.min.js"></script>
         <script type="text/javascript">
         <script type="text/javascript">
             // http://stackoverflow.com/questions/11582512/how-to-get-url-parameters-with-javascript
             // http://stackoverflow.com/questions/11582512/how-to-get-url-parameters-with-javascript
             function getURLParameter(name) {
             function getURLParameter(name) {