Browse Source

no longe embed JS automatically, enable with -D embedJs instead (fixed issue #698)

Nicolas Cannasse 13 years ago
parent
commit
f8aeeb4bef
3 changed files with 3 additions and 2 deletions
  1. 1 0
      doc/CHANGES.txt
  2. 1 1
      std/js/JQuery.hx
  3. 1 1
      std/js/SWFObject.hx

+ 1 - 0
doc/CHANGES.txt

@@ -14,6 +14,7 @@
 	all : allow constructing generic type parameters
 	swf : added support for SWC files in -swf-lib
 	macro : added Context.onTypeNotFound callback for unresolved types
+	js : no JS embed as default (use -D embedJs instead)
 
 2012-07-16: 2.10
 	java/cs : added two new targets (beta)

+ 1 - 1
std/js/JQuery.hx

@@ -345,7 +345,7 @@ extern class JQuery implements ArrayAccess<Dom.HtmlDom> {
 	}
 
 	private static function __init__() : Void untyped {
-		#if !noEmbedJS
+		#if !embedJs
 		if( untyped __js__("typeof($) == 'undefined'") )
 			haxe.macro.Tools.includeFile("js/jquery-latest.min.js");
 		#end

+ 1 - 1
std/js/SWFObject.hx

@@ -11,7 +11,7 @@ extern class SWFObject {
 	function setAttribute( id : String, value : String ) : Void;
 
 	private static function __init__() : Void untyped {
-		#if !noEmbedJS
+		#if !embedJs
 		haxe.macro.Tools.includeFile("js/swfobject-1.5.js");
 		#end
 		js.SWFObject = deconcept.SWFObject;