Bladeren bron

[jQuery] update to jQuery 1.12.1/2.2.1

Andy Li 9 jaren geleden
bovenliggende
commit
695baf3b29

+ 1 - 1
main.ml

@@ -1448,7 +1448,7 @@ try
 			"n"
 		| Js ->
 			if not (PMap.exists (fst (Define.infos Define.JqueryVer)) com.defines) then
-				Common.define_value com Define.JqueryVer "11103";
+				Common.define_value com Define.JqueryVer "11201";
 			add_std "js";
 			"js"
 		| Php ->

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

@@ -17,7 +17,7 @@ package js.jquery;
 	@:allow(js.jquery.JQuery)
 	macro static function embed() {
 		return if (haxe.macro.Context.defined("embed_js")) {
-			macro haxe.macro.Compiler.includeFile("js/jquery/jquery-1.11.3.min.js");
+			macro haxe.macro.Compiler.includeFile("js/jquery/jquery-1.12.1.min.js");
 		} else {
 			macro {};
 		}

+ 7 - 3
std/js/jquery/JQuery.hx

@@ -104,6 +104,10 @@ package js.jquery;
 		Holds or releases the execution of jQuery's ready event.
 	**/
 	static public function holdReady(hold:Bool):Void;
+	/**
+		Modify and filter HTML strings passed through <a href="/category/manipulation/">jQuery manipulation methods</a>.
+	**/
+	static public function htmlPrefilter(html:String):String;
 	/**
 		Search for a specified value within an array and return its index (or -1 if not found).
 	**/
@@ -121,7 +125,7 @@ package js.jquery;
 	**/
 	static public function isFunction(obj:Dynamic):Bool;
 	/**
-		Determines whether its argument is a number.
+		Determines whether its argument represents a JavaScript number.
 	**/
 	static public function isNumeric(value:Dynamic):Bool;
 	/**
@@ -229,7 +233,7 @@ package js.jquery;
 	**/
 	static public function uniqueSort(array:Array<js.html.Element>):Array<js.html.Element>;
 	/**
-		Provides a way to execute callback functions based on one or more objects, usually <a href="/category/deferred-object/">Deferred</a> objects that represent asynchronous events.
+		Provides a way to execute callback functions based on zero or more objects, usually <a href="/category/deferred-object/">Deferred</a> objects that represent asynchronous events.
 	**/
 	static public function when(deferreds:haxe.extern.Rest<js.jquery.Deferred>):js.jquery.Promise;
 	/**
@@ -771,7 +775,7 @@ package js.jquery;
 	**/
 	public function prependTo(target:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
 	/**
-		Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
+		Get the immediately preceding sibling of each element in the set of matched elements. If a selector is provided, it retrieves the previous sibling only if it matches that selector.
 	**/
 	public function prev(?selector:String):js.jquery.JQuery;
 	/**

File diff suppressed because it is too large
+ 0 - 1
std/js/jquery/jquery-1.11.3.min.js


File diff suppressed because it is too large
+ 1 - 0
std/js/jquery/jquery-1.12.1.min.js


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

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

Some files were not shown because too many files changed in this diff