Merge branch 'trunk' into bidi-map

Author: RenderMichael

javascript/private/fragment.bzl

@@ -1,12 +1,14 @@
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library")
 
+EXPORT_FUNCTION_NAME = "se_exportedFunctionSymbol"
+
 def _internal_closure_fragment_export_impl(ctx):
     ctx.actions.write(
         output = ctx.outputs.out,
         content = """
 goog.require('%s');
-goog.exportSymbol('_', %s);
-""" % (ctx.attr.module, ctx.attr.function),
+goog.exportSymbol('%s', %s);
+""" % (ctx.attr.module, EXPORT_FUNCTION_NAME, ctx.attr.function),
     )
 
 _internal_closure_fragment_export = rule(
@@ -59,10 +61,7 @@ def closure_fragment(
     #     See http://code.google.com/p/selenium/issues/detail?id=1333
     wrapper = (
         "function(){" +
-        "return (function(){%output%; return this._.apply(null,arguments);}).apply({" +
-        "navigator:typeof window!='undefined'?window.navigator:null," +
-        "document:typeof window!='undefined'?window.document:null" +
-        "}, arguments);}"
+        "return (function(){%output%; return this." + EXPORT_FUNCTION_NAME + ".apply(null,arguments);}).apply(window, arguments);}"
     )
 
     browser_defs = {