Skip to content

Commit 1b42502

Browse files
kevmookevmoo
committed
big update to packaged app
using chrome_gen updated other dependencies
1 parent 56d2b64 commit 1b42502

11 files changed

+17436
-11745
lines changed

‎app_package/dart_interop.js

Lines changed: 0 additions & 576 deletions
This file was deleted.

‎app_package/game_app.dart.js

Lines changed: 5871 additions & 10999 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app_package/game_app.dart.js.deps

Lines changed: 124 additions & 113 deletions
Large diffs are not rendered by default.

‎app_package/game_app.dart.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app_package/game_app.dart.precompiled.js

Lines changed: 11420 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app_package/index.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<meta property="og:image" content="http://dart-lang.github.io/pop-pop-win/images/icon_200.png" />
1313
<meta property='og:url' content='http://dart-lang.github.io/pop-pop-win/' />
1414
<link rel="canonical" href="http://dart-lang.github.io/pop-pop-win/" />
15-
<script src="dart.js"></script>
16-
<script src="interop.js"></script>
17-
<script src="dart_interop.js"></script>
18-
<script type="application/dart" src="game_app.dart"></script>
1915
</head>
2016
<body>
2117
<canvas id='gameCanvas' width='1024' height='768'></canvas>
@@ -45,5 +41,7 @@ <h1>Help</h1>
4541
<p>Unfreeze a balloon the same way: shift-click.</p>
4642
</div>
4743
</div>
44+
<script src="interop.js"></script>
45+
<script src="game_app.dart.precompiled.js"></script>
4846
</body>
4947
</html>

‎app_package/interop.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,9 @@ function DartProxy(o) {
224224
(function() {
225225
// Proxy support for js.dart.
226226

227-
var globalContext = window;
227+
// We don't use 'window' because we might be in a web worker, but we don't
228+
// use 'self' because not all browsers support it
229+
var globalContext = function() { return this; }();
228230

229231
// Table for local objects and functions that are proxied.
230232
function ProxiedObjectTable() {

‎app_package/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 2,
33
"name": "Pop, Pop, Win!",
4-
"version": "1.7",
4+
"version": "1.8",
55
"minimum_chrome_version": "27",
66
"icons": {
77
"16": "icons/icon_16.png",

‎app_package/platform_app.dart

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,22 @@ library ppw_platform_web;
33
import 'dart:async';
44

55
import 'package:meta/meta.dart';
6-
import 'package:js/js.dart' as js;
76
import 'package:poppopwin/platform_target.dart';
7+
import 'package:chrome_gen/gen/storage.dart';
88

99
class PlatformApp extends PlatformTarget {
10+
1011
PlatformApp() : super.base();
1112

1213
@override
13-
Future clearValues() {
14-
final completer = new Completer();
15-
16-
js.scoped(() {
17-
final onDone = new js.Callback.once(() => completer.complete());
18-
19-
_localProxy['clear'](onDone);
20-
});
21-
22-
return completer.future;
23-
}
14+
Future clearValues() => storage.local.clear();
2415

2516
@override
26-
Future setValue(String key, String value) {
27-
var map = new Map<String, String>()
28-
..[key] = value;
29-
30-
final completer = new Completer();
31-
32-
js.scoped(() {
33-
34-
final onDone = new js.Callback.once(() => completer.complete());
35-
36-
_localProxy['set'](js.map(map), onDone);
37-
});
38-
39-
return completer.future;
40-
}
17+
Future setValue(String key, String value) =>
18+
storage.local.set({key : value});
4119

4220
@override
43-
Future<String> getValue(String key) {
44-
final completer = new Completer();
45-
46-
js.scoped(() {
47-
final onDone = new js.Callback.once(
48-
(value) {
49-
completer.complete(value[key]);
50-
});
51-
52-
_localProxy['get'](key, onDone);
53-
});
54-
55-
return completer.future;
56-
}
57-
58-
js.Proxy get _localProxy => js.context['chrome']['storage']['local'];
21+
Future<String> getValue(String key) => storage.local.get(key)
22+
.then((Map<String, String> values) => values[key]);
5923

6024
}

‎pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ homepage: https://github.com/dart-lang/pop-pop-win
55
environment:
66
sdk: '>=0.8.1'
77
dependencies:
8-
bot: '>=0.23.1'
9-
bot_web: '>=0.20.5'
10-
js: '>=0.0.24'
8+
bot: '>=0.24.0'
9+
bot_web: '>=0.20.6'
10+
browser: '>=0.8.1'
11+
chrome_gen: '>=0.0.5'
1112
dev_dependencies:
1213
hop: '>=0.25.1'

0 commit comments

Comments
 (0)