Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: lib/runtime/dart/js.js

Issue 1528613004: First cut of mini dart:html. (Closed) Base URL: https://github.com/dart-lang/dev_compiler.git@master
Patch Set: Fix build_sdk Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/runtime/dart/html_common.js ('k') | lib/src/codegen/js_codegen.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/js.js
diff --git a/lib/runtime/dart/js.js b/lib/runtime/dart/js.js
index db2f65eb8ca61283c4141600cfdfbd663f358f00..902089002e7a12c499e9f3cdf90e07d59da5a2b2 100644
--- a/lib/runtime/dart/js.js
+++ b/lib/runtime/dart/js.js
@@ -7,9 +7,10 @@ dart_library.library('dart/js', null, /* Imports */[
], function(exports, dart, core, collection, _js_helper) {
'use strict';
let dartx = dart.dartx;
+ const _global = dart.global;
dart.defineLazyProperties(exports, {
get context() {
- return _wrapToDart(dart.global);
+ return _wrapToDart(_global);
}
});
const _jsObject = Symbol('_jsObject');
@@ -350,8 +351,12 @@ dart_library.library('dart/js', null, /* Imports */[
return wrapper;
}
dart.fn(_wrapDartFunction);
- function _convertToDart(o) {
- if (o == null || typeof o == "string" || typeof o == "number" || typeof o == "boolean" || dart.notNull(_isBrowserType(o))) {
+ function _convertToDart(o, isBrowserType) {
+ if (isBrowserType === void 0)
+ isBrowserType = null;
+ if (isBrowserType == null)
+ isBrowserType = _isBrowserType;
+ if (o == null || typeof o == "string" || typeof o == "number" || typeof o == "boolean" || dart.notNull(dart.dcall(isBrowserType, o))) {
return o;
} else if (o instanceof Date) {
let ms = o.getTime();
@@ -362,7 +367,7 @@ dart_library.library('dart/js', null, /* Imports */[
return _putIfAbsent(_dartProxies, o, _wrapToDart);
}
}
- dart.fn(_convertToDart, core.Object, [dart.dynamic]);
+ dart.fn(_convertToDart, core.Object, [dart.dynamic], [dart.functionType(core.bool, [dart.dynamic])]);
function _wrapToDart(o) {
if (typeof o == "function") {
return new JsFunction._fromJs(o);
« no previous file with comments | « lib/runtime/dart/html_common.js ('k') | lib/src/codegen/js_codegen.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698