浏览代码

[js] remove deprecated JQuery and SWFObject externs (#6116)

Dan Korostelev 8 年之前
父节点
当前提交
97f778cf18
共有 2 个文件被更改,包括 0 次插入455 次删除
  1. 0 413
      std/js/JQuery.hx
  2. 0 42
      std/js/SWFObject.hx

+ 0 - 413
std/js/JQuery.hx

@@ -1,413 +0,0 @@
-/*
- * Copyright (C)2005-2017 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-package js;
-
-import js.html.Window;
-import js.html.Element;
-
-@:deprecated("Use js.jquery.Event instead.")
-typedef JqEvent = {
-	var target : Element;
-	var currentTarget : Element;
-	var relatedTarget : Element;
-	var delegateTarget : Element;
-
-	var type : String;
-	var timeStamp : Int;
-
-	//var data : Dynamic;
-	//var namespace : String;
-	//var result : Dynamic;
-
-	// position
-	var pageX : Int;
-	var pageY : Int;
-
-	var wheelDelta : Int;
-
-	// keys
-	var keyCode : Int;
-	var charCode : Int;
-	var shiftKey : Bool;
-	var ctrlKey : Bool;
-	var altKey : Bool;
-	var metaKey : Bool;
-
-	var which : Int;
-
-	// propagation
-	function isDefaultPrevented() : Bool;
-	function isImmediatePropagationStopped() : Bool;
-	function isPropagationStopped() : Bool;
-	function preventDefault() : Void;
-	function stopImmediatePropagation() : Void;
-	function stopPropagation() : Void;
-}
-
-@:deprecated("Use js.jquery.Helper instead.")
-extern class JQueryHelper {
-	@:overload(function(j:JQuery):JQuery{})
-	@:overload(function(j:Window):JQuery{})
-	@:overload(function(j:Element):JQuery { } )
-
-	public static inline function J( html : haxe.extern.EitherType<String,haxe.extern.EitherType<JQuery,haxe.extern.EitherType<Window,Element>>> ) : JQuery {
-        return new JQuery(cast html);
-    }
-
-	public static var JTHIS(get, null) : JQuery;
-
-	static inline function get_JTHIS() : JQuery {
-		return new JQuery(js.Lib.nativeThis);
-	}
-
-}
-
-@:deprecated("Use js.jquery.JQuery instead.")
-@:initPackage
-extern class JQuery implements ArrayAccess<Element> {
-
-	var context(default,null) : Element;
-	var length(default, null) : Int;
-
-	@:selfCall
-	@:overload(function(j:JQuery):Void{})
-	@:overload(function(j:Window):Void{})
-	@:overload(function(j:Element):Void{})
-	function new( html : String ) : Void;
-
-	// attributes
-	function addClass( className : String ) : JQuery;
-	function removeClass( ?className : String ) : JQuery;
-	function hasClass( className : String ) : Bool;
-	function toggleClass( className : String, ?addRemove : Bool ) : JQuery;
-
-	@:overload(function(name:String,value:String):JQuery{})
-	function attr( name : String ) : String;
-
-	function removeAttr( attr : String ) : JQuery;
-
-	@:overload(function(name:String,value:Dynamic):JQuery{})
-	function prop( name : String ) : Dynamic;
-
-	@:overload(function(prop:String,value:String):JQuery{})
-	@:overload(function(map:{}):JQuery{})
-	function css( prop : String ) : String;
-
-	@:overload(function(html:String):JQuery{})
-	@:overload(function(html:JQuery):JQuery{})
-	function html() : String;
-
-	@:overload(function(value:String):JQuery{})
-	function val() : String;
-
-	@:overload(function(text:String):JQuery{})
-	function text() : String;
-
-	// Size & Position
-	@:overload(function(value:Int):JQuery{})
-	function width() : Int;
-	@:overload(function(value:Int):JQuery{})
-	function height() : Int;
-	@:overload(function(value:Int):JQuery{})
-	function innerWidth() : Int;
-	@:overload(function(value:Int):JQuery{})
-	function innerHeight() : Int;
-
-	function outerWidth( ?includeMargin : Bool ) : Int;
-	function outerHeight( ?includeMargin : Bool ) : Int;
-
-	@:overload(function(value:Int):JQuery{})
-	function scrollLeft() : Int;
-
-	@:overload(function(value:Int):JQuery{})
-	function scrollTop() : Int;
-
-	@:overload(function(value: { left : Int, top : Int }):JQuery{})
-	function offset() : { left : Int, top : Int };
-
-	function offsetParent() : JQuery;
-
-	@:overload(function(value: { left : Int, top : Int }):JQuery{})
-	function position() : { left : Int, top : Int };
-
-	// current group manipulation
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	@:overload(function(value:Array<Element>):JQuery{})
-	function add( selector : String, ?context : JQuery ) : JQuery;
-	function andSelf() : JQuery;
-	function children( ?selector : String ) : JQuery;
-	function clone( ?withDataAndEvents : Bool ) : JQuery;
-	function closest( selector : String, ?context : JQuery ) : JQuery;
-	function contents() : JQuery;
-
-	@:overload(function( f : Int -> Element -> Void ):JQuery{})
-	function each( f : Void -> Void ) : JQuery;
-	function end() : JQuery;
-	function eq( index : Int ) : JQuery;
-	function filter( selector : String ) : JQuery;
-	function find( selector : String ) : JQuery;
-	function first() : JQuery;
-	function index( ?selector : String ) : Int;
-	function last( ?selector : String ) : JQuery;
-	function has( selector : String ) : JQuery;
-	function next( ?selector : String ) : JQuery;
-	function nextAll( ?selector : String ) : JQuery;
-	function nextUntil( ?selector : String ) : JQuery;
-	function parent( ?selector : String ) : JQuery;
-	function parents( ?selector : String ) : JQuery;
-	function parentsUntil( ?selector : String ) : JQuery;
-	@:overload(function(value:Element):JQuery{})
-	function not( selector : String ) : JQuery;
-	function prev( ?selector : String ) : JQuery;
-	function prevAll( ?selector : String ) : JQuery;
-	function prevUntil( ?selector : String ) : JQuery;
-	function pushStack( elements : Array<Element> ) : JQuery;
-	function siblings( ?selector : String ) : JQuery;
-	function size() : Int;
-	function slice( start : Int, ?end : Int ) : JQuery;
-	function toArray() : Array<Element>;
-
-	// DOM changes
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function before( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function after( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function append( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function appendTo( html : String ) : JQuery;
-
-	function detach( ?selector : String ) : JQuery;
-	function empty() : JQuery; // remove all texts
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function insertBefore( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function insertAfter( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function prepend( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function prependTo( html : String ) : JQuery;
-
-	function remove( ?selector : String ) : JQuery;
-	function replaceAll( selector : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function replaceWith( html : String ) : JQuery;
-
-	function unwrap() : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function wrap( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function wrapAll( html : String ) : JQuery;
-
-	@:overload(function(value:JQuery):JQuery{})
-	@:overload(function(value:Element):JQuery{})
-	function wrapInner( html : String ) : JQuery;
-
-	// animation
-	@:overload(function(properties:{},?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function animate( properties : { }, ?duration : Int, ?callb : Void -> Void ) : JQuery;
-
-	function delay( duration : Int, ?queueName : String ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function hide( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function fadeIn( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function fadeOut( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(duration:Int,opacity:Float,?easing:String,?call:Void->Void) : JQuery{})
-	function fadeTo( duration : Int, opacity : Float, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function fadeToggle( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function show( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function slideDown( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function slideToggle( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function slideUp( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	function stop( ?clearQueue : Bool, ?jumpToEnd : Bool ) : JQuery;
-
-	@:overload(function(?duration:Int,?easing:String,?call:Void->Void) : JQuery{})
-	function toggle( ?duration : Int, ?call : Void -> Void ) : JQuery;
-
-	// Events
-	function blur( ?callb : JqEvent -> Void ) : JQuery;
-	function change( ?callb : JqEvent -> Void ) : JQuery;
-
-	@:overload(function(callb:Void->Void):JQuery { } )
-	@:overload(function(callb:JQuery.JqEvent->Void):JQuery{})
-	@:overload(function(callb:Void->Bool):JQuery{})
-	function click( ?callb : JqEvent -> Void ) : JQuery;
-	function dblclick( ?callb : JqEvent -> Void ) : JQuery;
-	function error( ?callb : JqEvent -> Void ) : JQuery;
-	function focus( ?callb : JqEvent -> Void ) : JQuery;
-	function focusin( ?callb : JqEvent -> Void ) : JQuery;
-	function focusout( ?callb : JqEvent -> Void ) : JQuery;
-
-	@:overload(function(onInOut:JqEvent->Void):JQuery{})
-	function hover( onIn : JqEvent -> Void, ?onOut : JqEvent -> Void ) : JQuery;
-
-	@:overload(function( callb : JQuery.JqEvent -> Bool ) : JQuery {})
-	function keydown( ?callb : JqEvent -> Void ) : JQuery;
-
-	@:overload(function( callb : JQuery.JqEvent -> Bool ) : JQuery {})
-	function keypress( ?callb : JqEvent -> Void ) : JQuery;
-
-	@:overload(function( callb : JQuery.JqEvent -> Bool ) : JQuery {})
-	function keyup( ?callb : JqEvent -> Void ) : JQuery;
-
-	function mousedown( ?callb : JqEvent -> Void ) : JQuery;
-	function mouseenter( ?callb : JqEvent -> Void ) : JQuery;
-	function mouseleave( ?callb : JqEvent -> Void ) : JQuery;
-	function mouseout( ?callb : JqEvent -> Void ) : JQuery;
-	function mouseover( ?callb : JqEvent -> Void ) : JQuery;
-	function mousemove( ?callb : JqEvent -> Void ) : JQuery;
-	function mouseup( ?callb : JqEvent -> Void ) : JQuery;
-
-	// AJAX overloads
-	@:overload(function( url:String, ?data : {}, ?callb : String -> String -> Void ) : JQuery {})
-	@:overload(function( url:String, ?data : {}, ?callb : String -> Void ) : JQuery {})
-	@:overload(function( url:String, ?data : {}, ?callb : Void -> Void ) : JQuery {})
-	function load( ?callb : JqEvent -> Void ) : JQuery;
-	function ready( callb : JqEvent -> Void ) : JQuery;
-	function resize( ?callb : JqEvent -> Void ) : JQuery;
-	function scroll( ?callb : JqEvent -> Void ) : JQuery;
-	function select( ?callb : JqEvent -> Void ) : JQuery;
-	function submit( ?callb : JqEvent -> Void ) : JQuery;
-	function unload( ?callb : JqEvent -> Void ) : JQuery;
-
-	function bind( events : String, callb : JqEvent -> Void ) : JQuery;
-	function delegate( selector : String, events : String, callb : JqEvent -> Void ) : JQuery;
-	function die( ?events : String, ?callb : JqEvent -> Void ) : JQuery;
-	function one( events : String, callb : JqEvent -> Void ) : JQuery;
-	function live( events : String, callb : JqEvent -> Void ) : JQuery;
-	function trigger( events : String ) : JQuery;
-	function triggerHandler( events : String ) : JQuery;
-	function unbind( ?events : String, ?callb : JqEvent -> Void ) : JQuery;
-	function undelegate( ?selector : String, ?events : String, ?callb : JqEvent -> Void ) : JQuery;
-
-	// JQuery 1.7+
-	@:overload(function(events:Dynamic<JqEvent->Void>):JQuery{})
-	@:overload(function(events : String, selector : String, callb : JqEvent -> Void ):JQuery{})
-	function on( events : String, callb : JqEvent -> Void ) : JQuery;
-
-	// queue
-	function clearQueue( ?queueName : String ) : JQuery;
-	function dequeue( ?queueName : String ) : JQuery;
-	function queue( ?queueName : String, ?callb : (Void -> Void) -> Void ) : { length : Int };
-
-	// ajax
-	// TODO
-
-	// deferred
-	// TODO
-
-	// other tools
-	@:overload(function(index:Int):Element{})
-	function get() : Array<Element>;
-
-	@:overload(function(j:JQuery):Bool{})
-	function is( selector : String ) : Bool;
-
-	@:overload(function() : Dynamic {})
-	@:overload(function( key : String ) : Dynamic {})
-	function data( key : String, value : Dynamic ) : JQuery;
-	function removeData( ?key : String ) : JQuery;
-	function serialize() : String;
-	function serializeArray() : Array<{ name : String, value : String }>;
-	//inline function map<T>( f : JQuery -> T ) : Array<T> {
-	//	return untyped this["map"](function() return f(cur)).get();
-	//}
-
-	// Haxe addition
-	@:runtime inline function iterator() : Iterator<JQuery> {
-		return untyped __define_feature__('js.JQuery.iterator', this["iterator"])();
-	}
-
-	/**
-		Return the current JQuery element (in a callback), similar to $(this) in JS.
-	**/
-	static var cur(get, null) : JQuery;
-
-	static var fx(default, null) : { off : Bool, interval : Int };
-	static var browser(default, null) : { webkit : Bool, opera : Bool, msie : Bool, mozilla : Bool, version : String };
-
-	static function contains( parent : Element, child : Element ) : Bool;
-	static function noConflict( ?removeAll : Bool ) : Void;
-	static function parseJSON( json : String ) : Dynamic;
-	static function globalEval( js : String ) : Void;
-
-
-	//static function parseXML
-	//static function get, post
-	//static function getJSON, getScript, grep
-	//static function is*, makeArray, map, merge, noop, now, param, proxy, sub, trim, type, unique
-
-	private static inline function get_cur() : JQuery {
-		return new js.JQuery(js.Lib.nativeThis);
-	}
-
-	private static function __init__() : Void untyped {
-		#if embed_js
-		#error "Haxe no longer bundle third-party JS libraries. Please remove `-D embed-js`. You may download the JS files and use `haxe.macro.Compiler.includeFile`."
-		#end
-		var q : Dynamic = (untyped js.Browser.window).jQuery;
-		untyped __js__("var js = js || {}");
-		js.JQuery = q;
-		__feature__('js.JQuery.iterator',
-			q.fn.iterator = function() return { pos : 0, j : __this__, hasNext : function() return __this__.pos < __this__.j.length, next : function() return $(__this__.j[__this__.pos++]) }
-		);
-	}
-}

+ 0 - 42
std/js/SWFObject.hx

@@ -1,42 +0,0 @@
-/*
- * Copyright (C)2005-2017 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-package js;
-
-@:deprecated("Use js.swfobject.SWFObject instead.")
-@:initPackage
-extern class SWFObject {
-
-	function new( swf : String, id : String, width : Int, height : Int, ver : String, color : String /*...*/ ) : Void;
-	function addParam( param : String, value : String ) : Void;
-	function getSWFHTML() : String;
-	function write( elementId : String ) : Bool;
-	function addVariable( param : String, value : String ) : Void;
-	function setAttribute( id : String, value : String ) : Void;
-
-	private static function __init__() : Void untyped {
-		#if embed_js
-		#error "Haxe no longer bundle third-party JS libraries. Please remove `-D embed-js`. You may download the JS files and use `haxe.macro.Compiler.includeFile`."
-		#end
-		js.SWFObject = deconcept.SWFObject;
-	}
-
-}