Merge remote-tracking branch 'upstream/master'

t

Author: bnussey

nativescript-imagepicker/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/NativeScript/nativescript-imagepicker"
   },
   "name": "nativescript-imagepicker",
-  "version": "2.4.1",
+  "version": "2.5.1",
   "nativescript": {
     "platforms": {
       "android": "2.4.0",

nativescript-imagepicker/viewmodel.android.ts

@@ -2,7 +2,7 @@ import * as observable from "data/observable";
 import * as imagesource from "image-source";
 import * as application from "application";
 import * as platform from "platform";
-import imageAssetModule = require("image-asset");
+import * as imageAssetModule from "image-asset";
 
 interface ArrayBufferStatic extends ArrayBufferConstructor {
     from(buffer: java.nio.ByteBuffer): ArrayBuffer;
@@ -391,4 +391,4 @@ export class ImagePicker {
 
 export function create(options?): ImagePicker {
     return new ImagePicker(options);
-}
+}

nativescript-imagepicker/viewmodel.ios.ts

@@ -1,9 +1,8 @@
-import data_observable = require("data/observable");
-import data_observablearray = require("data/observable-array");
-import frame = require("ui/frame");
-import imageAssetModule = require("image-asset");
-
-import image_source = require("image-source");
+import * as data_observable from "data/observable";
+import * as data_observablearray from "data/observable-array";
+import * as frame from "ui/frame";
+import * as imageAssetModule from "image-asset";
+import * as image_source from "image-source";
 
 if (global.TNS_WEBPACK) {
     var albumsModule = require("./albums.ios");