| Index: sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
|
| diff --git a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
|
| index 480d092c6df34b913fab3f0b138bbb49e8ccaf03..5a311292011d7fe2488b78e0214eee1ec95df678 100644
|
| --- a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
|
| +++ b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
|
| @@ -330,7 +330,7 @@ class Index native "*IDBIndex" {
|
| if (!?key_OR_range) {
|
| return _count_1();
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null))) {
|
| + if ((key_OR_range is KeyRange || key_OR_range == null)) {
|
| return _count_2(key_OR_range);
|
| }
|
| if (?key_OR_range) {
|
| @@ -348,7 +348,7 @@ class Index native "*IDBIndex" {
|
|
|
| /// @domName IDBIndex.get; @docsEditable true
|
| Request get(key) {
|
| - if ((?key && (key is KeyRange || key == null))) {
|
| + if ((key is KeyRange || key == null)) {
|
| return _get_1(key);
|
| }
|
| if (?key) {
|
| @@ -366,7 +366,7 @@ class Index native "*IDBIndex" {
|
|
|
| /// @domName IDBIndex.getKey; @docsEditable true
|
| Request getKey(key) {
|
| - if ((?key && (key is KeyRange || key == null))) {
|
| + if ((key is KeyRange || key == null)) {
|
| return _getKey_1(key);
|
| }
|
| if (?key) {
|
| @@ -388,11 +388,11 @@ class Index native "*IDBIndex" {
|
| !?direction) {
|
| return _openCursor_1();
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null)) &&
|
| + if ((key_OR_range is KeyRange || key_OR_range == null) &&
|
| !?direction) {
|
| return _openCursor_2(key_OR_range);
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null))) {
|
| + if ((key_OR_range is KeyRange || key_OR_range == null)) {
|
| return _openCursor_3(key_OR_range, direction);
|
| }
|
| if (?key_OR_range &&
|
| @@ -428,11 +428,11 @@ class Index native "*IDBIndex" {
|
| !?direction) {
|
| return _openKeyCursor_1();
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null)) &&
|
| + if ((key_OR_range is KeyRange || key_OR_range == null) &&
|
| !?direction) {
|
| return _openKeyCursor_2(key_OR_range);
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null))) {
|
| + if ((key_OR_range is KeyRange || key_OR_range == null)) {
|
| return _openKeyCursor_3(key_OR_range, direction);
|
| }
|
| if (?key_OR_range &&
|
| @@ -629,7 +629,7 @@ class ObjectStore native "*IDBObjectStore" {
|
| if (!?key_OR_range) {
|
| return _count_1();
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null))) {
|
| + if ((key_OR_range is KeyRange || key_OR_range == null)) {
|
| return _count_2(key_OR_range);
|
| }
|
| if (?key_OR_range) {
|
| @@ -647,19 +647,19 @@ class ObjectStore native "*IDBObjectStore" {
|
|
|
| /// @domName IDBObjectStore.createIndex; @docsEditable true
|
| Index createIndex(String name, keyPath, [Map options]) {
|
| - if ((?keyPath && (keyPath is List<String> || keyPath == null)) &&
|
| + if ((keyPath is List<String> || keyPath == null) &&
|
| !?options) {
|
| return _createIndex_1(name, keyPath);
|
| }
|
| - if ((?keyPath && (keyPath is List<String> || keyPath == null))) {
|
| + if ((keyPath is List<String> || keyPath == null)) {
|
| var options_1 = convertDartToNative_Dictionary(options);
|
| return _createIndex_2(name, keyPath, options_1);
|
| }
|
| - if ((?keyPath && (keyPath is String || keyPath == null)) &&
|
| + if ((keyPath is String || keyPath == null) &&
|
| !?options) {
|
| return _createIndex_3(name, keyPath);
|
| }
|
| - if ((?keyPath && (keyPath is String || keyPath == null))) {
|
| + if ((keyPath is String || keyPath == null)) {
|
| var options_2 = convertDartToNative_Dictionary(options);
|
| return _createIndex_4(name, keyPath, options_2);
|
| }
|
| @@ -676,7 +676,7 @@ class ObjectStore native "*IDBObjectStore" {
|
|
|
| /// @domName IDBObjectStore.delete; @docsEditable true
|
| Request delete(key_OR_keyRange) {
|
| - if ((?key_OR_keyRange && (key_OR_keyRange is KeyRange || key_OR_keyRange == null))) {
|
| + if ((key_OR_keyRange is KeyRange || key_OR_keyRange == null)) {
|
| return _delete_1(key_OR_keyRange);
|
| }
|
| if (?key_OR_keyRange) {
|
| @@ -695,7 +695,7 @@ class ObjectStore native "*IDBObjectStore" {
|
|
|
| /// @domName IDBObjectStore.getObject; @docsEditable true
|
| Request getObject(key) {
|
| - if ((?key && (key is KeyRange || key == null))) {
|
| + if ((key is KeyRange || key == null)) {
|
| return _getObject_1(key);
|
| }
|
| if (?key) {
|
| @@ -720,11 +720,11 @@ class ObjectStore native "*IDBObjectStore" {
|
| !?direction) {
|
| return _openCursor_1();
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null)) &&
|
| + if ((key_OR_range is KeyRange || key_OR_range == null) &&
|
| !?direction) {
|
| return _openCursor_2(key_OR_range);
|
| }
|
| - if ((?key_OR_range && (key_OR_range is KeyRange || key_OR_range == null))) {
|
| + if ((key_OR_range is KeyRange || key_OR_range == null)) {
|
| return _openCursor_3(key_OR_range, direction);
|
| }
|
| if (?key_OR_range &&
|
|
|