Updated version and RELEASENOTES.md for release 1.4.0

This closes #158

.gitignore

@@ -12,6 +12,7 @@ Thumbs.db
 *.swp
 *.user
 
+node_modules
 
 
 

.jshintrc

@@ -0,0 +1,16 @@
+{
+    "browser": true
+  , "devel": true
+  , "bitwise": true
+  , "undef": true
+  , "trailing": true
+  , "quotmark": false
+  , "indent": 4
+  , "unused": "vars"
+  , "latedef": "nofunc"
+  , "globals": {
+        "module": false,
+        "exports": false,
+        "require": false
+    }
+}

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+sudo: false
+node_js:
+  - "4.2"

README.md

@@ -17,6 +17,8 @@
 #         under the License.
 -->
 
+[![Build Status](https://travis-ci.org/apache/cordova-plugin-inappbrowser.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-inappbrowser)
+
 # cordova-plugin-inappbrowser
 
 This plugin provides a web browser view that displays when calling `cordova.InAppBrowser.open()`.
@@ -54,7 +56,7 @@ Although `window.open` is in the global scope, InAppBrowser is not available unt
         console.log("window.open works well");
     }
 
-:warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+Report issues with this plugin on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
 
 
 
@@ -198,7 +200,7 @@ The object returned from a call to `cordova.InAppBrowser.open`.
 - executeScript
 - insertCSS
 
-## addEventListener
+## InAppBrowser.addEventListener
 
 > Adds a listener for an event from the `InAppBrowser`.
 
@@ -244,7 +246,7 @@ The object returned from a call to `cordova.InAppBrowser.open`.
     var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
     ref.addEventListener('loadstart', function(event) { alert(event.url); });
 
-## removeEventListener
+## InAppBrowser.removeEventListener
 
 > Removes a listener for an event from the `InAppBrowser`.
 
@@ -278,7 +280,7 @@ The function is passed an `InAppBrowserEvent` object.
     ref.addEventListener('loadstart', myCallback);
     ref.removeEventListener('loadstart', myCallback);
 
-## close
+## InAppBrowser.close
 
 > Closes the `InAppBrowser` window.
 
@@ -301,7 +303,7 @@ The function is passed an `InAppBrowserEvent` object.
     var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
     ref.close();
 
-## show
+## InAppBrowser.show
 
 > Displays an InAppBrowser window that was opened hidden. Calling this has no effect if the InAppBrowser was already visible.
 
@@ -323,7 +325,7 @@ The function is passed an `InAppBrowserEvent` object.
     // some time later...
     ref.show();
 
-## executeScript
+## InAppBrowser.executeScript
 
 > Injects JavaScript code into the `InAppBrowser` window
 
@@ -365,7 +367,7 @@ The function is passed an `InAppBrowserEvent` object.
 
 Due to [MSDN docs](https://msdn.microsoft.com/en-us/library/windows.ui.xaml.controls.webview.invokescriptasync.aspx) the invoked script can return only string values, otherwise the parameter, passed to __callback__ will be `[null]`.
 
-## insertCSS
+## InAppBrowser.insertCSS
 
 > Injects CSS into the `InAppBrowser` window.
 

RELEASENOTES.md

@@ -20,6 +20,13 @@
 -->
 # Release Notes
 
+### 1.4.0 (Apr 15, 2016)
+* CB-7679 add fix for **iOS** upload.
+* CB-10944 `NoSuchMethodError` in `InAppBrowser` plugin
+* CB-10937 fix stretched icons
+* CB-10760 Fixing README for display on Cordova website
+* CB-10636 Add `JSHint` for plugins
+
 ### 1.3.0 (Feb 09, 2016)
 * [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Set custom inappbrowser user agent for android
 * [CB-10538](https://issues.apache.org/jira/browse/CB-10538) cordova-plugin-inappbrowser timeout issue

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-inappbrowser",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Cordova InAppBrowser Plugin",
   "cordova": {
     "id": "cordova-plugin-inappbrowser",
@@ -37,6 +37,10 @@
     "cordova-windows",
     "cordova-firefoxos"
   ],
+  "scripts": {
+    "test": "npm run jshint",
+    "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests"
+  },
   "engines": [
     {
       "name": "cordova",
@@ -44,5 +48,8 @@
     }
   ],
   "author": "Apache Software Foundation",
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "jshint": "^2.6.0"
+  }
 }

plugin.xml

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="cordova-plugin-inappbrowser"
-      version="1.3.0">
+      version="1.4.0">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>

src/android/InAppBrowser.java

@@ -19,7 +19,6 @@
 package org.apache.cordova.inappbrowser;
 
 import android.annotation.SuppressLint;
-import org.apache.cordova.inappbrowser.InAppBrowserDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Browser;
@@ -46,8 +45,9 @@ import android.webkit.HttpAuthHandler;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
@@ -564,7 +564,7 @@ public class InAppBrowser extends CordovaPlugin {
                 actionButtonContainer.setId(Integer.valueOf(1));
 
                 // Back button
-                Button back = new Button(cordova.getActivity());
+                ImageButton back = new ImageButton(cordova.getActivity());
                 RelativeLayout.LayoutParams backLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                 backLayoutParams.addRule(RelativeLayout.ALIGN_LEFT);
                 back.setLayoutParams(backLayoutParams);
@@ -573,14 +573,12 @@ public class InAppBrowser extends CordovaPlugin {
                 Resources activityRes = cordova.getActivity().getResources();
                 int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName());
                 Drawable backIcon = activityRes.getDrawable(backResId);
-                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
-                {
-                    back.setBackgroundDrawable(backIcon);
-                }
-                else
-                {
-                    back.setBackground(backIcon);
-                }
+                back.setBackground(null);
+                back.setImageDrawable(backIcon);
+                back.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                back.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
+                back.getAdjustViewBounds();
+
                 back.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
                         goBack();
@@ -588,7 +586,7 @@ public class InAppBrowser extends CordovaPlugin {
                 });
 
                 // Forward button
-                Button forward = new Button(cordova.getActivity());
+                ImageButton forward = new ImageButton(cordova.getActivity());
                 RelativeLayout.LayoutParams forwardLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                 forwardLayoutParams.addRule(RelativeLayout.RIGHT_OF, 2);
                 forward.setLayoutParams(forwardLayoutParams);
@@ -596,14 +594,12 @@ public class InAppBrowser extends CordovaPlugin {
                 forward.setId(Integer.valueOf(3));
                 int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName());
                 Drawable fwdIcon = activityRes.getDrawable(fwdResId);
-                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
-                {
-                    forward.setBackgroundDrawable(fwdIcon);
-                }
-                else
-                {
-                    forward.setBackground(fwdIcon);
-                }
+                forward.setBackground(null);
+                forward.setImageDrawable(fwdIcon);
+                forward.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                forward.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
+                forward.getAdjustViewBounds();
+
                 forward.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
                         goForward();
@@ -634,7 +630,7 @@ public class InAppBrowser extends CordovaPlugin {
                 });
 
                 // Close/Done button
-                Button close = new Button(cordova.getActivity());
+                ImageButton close = new ImageButton(cordova.getActivity());
                 RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                 closeLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
                 close.setLayoutParams(closeLayoutParams);
@@ -642,14 +638,12 @@ public class InAppBrowser extends CordovaPlugin {
                 close.setId(Integer.valueOf(5));
                 int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName());
                 Drawable closeIcon = activityRes.getDrawable(closeResId);
-                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
-                {
-                    close.setBackgroundDrawable(closeIcon);
-                }
-                else
-                {
-                    close.setBackground(closeIcon);
-                }
+                close.setBackground(null);
+                close.setImageDrawable(closeIcon);
+                close.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                back.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
+                close.getAdjustViewBounds();
+
                 close.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
                         closeDialog();
@@ -675,7 +669,7 @@ public class InAppBrowser extends CordovaPlugin {
 
                 String overrideUserAgent = preferences.getString("OverrideUserAgent", null);
                 String appendUserAgent = preferences.getString("AppendUserAgent", null);
-                
+
                 if (overrideUserAgent != null) {
                     settings.setUserAgentString(overrideUserAgent);
                 }

src/browser/InAppBrowserProxy.js

@@ -19,10 +19,7 @@
  *
 */
 
-var cordova = require('cordova'),
-    channel = require('cordova/channel'),
-    modulemapper = require('cordova/modulemapper'),
-    urlutil = require('cordova/urlutil');
+var modulemapper = require('cordova/modulemapper');
 
 var browserWrap,
     popup,
@@ -69,8 +66,7 @@ var IAB = {
     open: function (win, lose, args) {
         var strUrl = args[0],
             target = args[1],
-            features = args[2],
-            url;
+            features = args[2];
 
         if (target === "_self" || !target) {
             window.location = strUrl;
@@ -193,7 +189,9 @@ var IAB = {
         if (browserWrap && popup) {
             try {
                 popup.contentWindow.eval(code);
-                hasCallback && win([]);
+                if (hasCallback) {
+                    win([]);
+                }
             } catch(e) {
                 console.error('Error occured while trying to injectScriptCode: ' + JSON.stringify(e));
             }
@@ -203,19 +201,25 @@ var IAB = {
     injectScriptFile: function (win, fail, args) {
         var msg = 'Browser cordova-plugin-inappbrowser injectScriptFile is not yet implemented';
         console.warn(msg);
-        fail && fail(msg);
+        if (fail) {
+            fail(msg);
+        }
     }, 
 
     injectStyleCode: function (win, fail, args) {
         var msg = 'Browser cordova-plugin-inappbrowser injectStyleCode is not yet implemented';
         console.warn(msg);
-        fail && fail(msg);
+        if (fail) {
+            fail(msg);
+        }
     },
 
     injectStyleFile: function (win, fail, args) {
         var msg = 'Browser cordova-plugin-inappbrowser injectStyleFile is not yet implemented';
         console.warn(msg);
-        fail && fail(msg);
+        if (fail) {
+            fail(msg);
+        }
     }
 };
 

src/firefoxos/InAppBrowserProxy.js

@@ -21,9 +21,7 @@
 
 // https://developer.mozilla.org/en-US/docs/WebAPI/Browser
 
-var cordova = require('cordova'),
-    channel = require('cordova/channel'),
-    modulemapper = require('cordova/modulemapper');
+var modulemapper = require('cordova/modulemapper');
 
 var origOpenFunc = modulemapper.getOriginalSymbol(window, 'window.open');
 var browserWrap;
@@ -49,9 +47,7 @@ var IABExecs = {
         var strUrl = args[0],
             target = args[1],
             features_string = args[2] || "location=yes", //location=yes is default
-            features = {},
-            url,
-            elem;
+            features = {};
 
         var features_list = features_string.split(',');
         features_list.forEach(function(feature) {
@@ -61,7 +57,7 @@ var IABExecs = {
             } else if (tup[1] == 'no') {
                 tup[1] = false;
             } else {
-                var number = parseInt(tup[1]);    
+                var number = parseInt(tup[1]);
                 if (!isNaN(number)) {
                     tup[1] = number;
                 }
@@ -115,7 +111,7 @@ var IABExecs = {
             back.classList.add('inAppBrowserBack');
             forward.classList.add('inAppBrowserForward');
 
-            function checkForwardBackward() {
+            var checkForwardBackward = function () {
                 var backReq = browserElem.getCanGoBack();
                 backReq.onsuccess = function() {
                     if (this.result) {
@@ -123,7 +119,7 @@ var IABExecs = {
                     } else {
                         back.classList.add('disabled');
                     }
-                }
+                };
                 var forwardReq = browserElem.getCanGoForward();
                 forwardReq.onsuccess = function() {
                     if (this.result) {
@@ -131,7 +127,7 @@ var IABExecs = {
                     } else {
                         forward.classList.add('disabled');
                     }
-                }
+                };
             };
 
             browserElem.addEventListener('mozbrowserloadend', checkForwardBackward);
@@ -163,16 +159,16 @@ var IABExecs = {
                 win({
                     type:'loadstart',
                     url : e.detail
-                })
+                });
             }, false);
             browserElem.addEventListener('mozbrowserloadend', function(e){
-                win({type:'loadstop'})
+                win({type:'loadstop'});
             }, false);
             browserElem.addEventListener('mozbrowsererror', function(e){
-                win({type:'loaderror'})
+                win({type:'loaderror'});
             }, false);
             browserElem.addEventListener('mozbrowserclose', function(e){
-                win({type:'exit'})
+                win({type:'exit'});
             }, false);
         } else {
             window.location = strUrl;

src/ios/CDVInAppBrowser.m

@@ -998,6 +998,12 @@
 
 @implementation CDVInAppBrowserNavigationController : UINavigationController
 
+- (void) dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion {
+    if ( self.presentedViewController) {
+        [super dismissViewControllerAnimated:flag completion:completion];
+    }
+}
+
 - (void) viewDidLoad {
 
     CGRect frame = [UIApplication sharedApplication].statusBarFrame;
@@ -1019,8 +1025,8 @@
             CGFloat temp = rect.size.width;
             rect.size.width = rect.size.height;
             rect.size.height = temp;
-            rect.origin = CGPointZero;
         }
+        rect.origin = CGPointZero;
     }
     return rect;
 }

src/ubuntu/InAppBrowser_escapeScript.js

@@ -19,6 +19,9 @@
  *
 */
 
+/* jshint -W061 */
+/* global oxide */
+
 oxide.addMessageHandler("EXECUTE", function(msg) {
     var code = msg.args.code;
     try {

src/windows/InAppBrowserProxy.js

@@ -19,10 +19,8 @@
  *
 */
 
-/*jslint sloppy:true */
-/*global Windows:true, require, document, setTimeout, window, module */
-
-
+/* jslint sloppy:true */
+/* global Windows:true, setImmediate */
 
 var cordova = require('cordova'),
     urlutil = require('cordova/urlutil');
@@ -188,7 +186,7 @@ var IAB = {
                     };
 
                     navigationButtonsDivInner = document.createElement("div");
-                    navigationButtonsDivInner.className = "inappbrowser-app-bar-inner"
+                    navigationButtonsDivInner.className = "inappbrowser-app-bar-inner";
                     navigationButtonsDivInner.onclick = function (e) {
                         e.cancelBubble = true;
                     };
@@ -253,9 +251,11 @@ var IAB = {
             if (isWebViewAvailable && browserWrap && popup) {
                 var op = popup.invokeScriptAsync("eval", code);
                 op.oncomplete = function (e) {
-                    // return null if event target is unavailable by some reason
-                    var result = (e && e.target) ? [e.target.result] : [null];
-                    hasCallback && win(result);
+                    if (hasCallback) {
+                        // return null if event target is unavailable by some reason
+                        var result = (e && e.target) ? [e.target.result] : [null];
+                        win(result);
+                    }
                 };
                 op.onerror = function () { };
                 op.start();
@@ -278,8 +278,10 @@ var IAB = {
                     Windows.Storage.FileIO.readTextAsync(file).done(function (code) {
                         var op = popup.invokeScriptAsync("eval", code);
                         op.oncomplete = function(e) {
-                            var result = [e.target.result];
-                            hasCallback && win(result);
+                            if (hasCallback) {
+                                var result = [e.target.result];
+                                win(result);
+                            }
                         };
                         op.onerror = function () { };
                         op.start();
@@ -329,7 +331,9 @@ function injectCSS (webView, cssCode, callback) {
 
     var op = webView.invokeScriptAsync("eval", evalWrapper);
     op.oncomplete = function() {
-        callback && callback([]);
+        if (callback) {
+            callback([]);
+        }
     };
     op.onerror = function () { };
     op.start();

tests/plugin.xml

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="cordova-plugin-inappbrowser-tests"
-    version="1.3.0">
+    version="1.4.0">
     <name>Cordova InAppBrowser Plugin Tests</name>
     <license>Apache 2.0</license>
 

tests/resources/inject.js

@@ -16,5 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-var d = document.getElementById("header")
+var d = document.getElementById("header");
 d.innerHTML = "Script file successfully injected";

tests/tests.js

@@ -19,6 +19,9 @@
  *
 */
 
+/* jshint jasmine: true */
+/* global MSApp */
+
 var cordova = require('cordova');
 var isWindows = cordova.platformId == 'windows';
 
@@ -183,13 +186,13 @@ exports.defineManualTests = function (contentEl, createActionButton) {
                 if (e.url != lastLoadStartURL) {
                     alert('Unexpected: ' + e.type + ' event.url != loadstart\'s event.url');
                 }
-                if (numExpectedRedirects === 0 && counts['loadstart'] !== 1) {
+                if (numExpectedRedirects === 0 && counts.loadstart !== 1) {
                     // Do allow a loaderror without a loadstart (e.g. in the case of an invalid URL).
-                    if (!(e.type == 'loaderror' && counts['loadstart'] === 0)) {
-                        alert('Unexpected: got multiple loadstart events. (' + counts['loadstart'] + ')');
+                    if (!(e.type == 'loaderror' && counts.loadstart === 0)) {
+                        alert('Unexpected: got multiple loadstart events. (' + counts.loadstart + ')');
                     }
-                } else if (numExpectedRedirects > 0 && counts['loadstart'] < (numExpectedRedirects + 1)) {
-                    alert('Unexpected: should have got at least ' + (numExpectedRedirects + 1) + ' loadstart events, but got ' + counts['loadstart']);
+                } else if (numExpectedRedirects > 0 && counts.loadstart < (numExpectedRedirects + 1)) {
+                    alert('Unexpected: should have got at least ' + (numExpectedRedirects + 1) + ' loadstart events, but got ' + counts.loadstart);
                 }
                 wasReset = true;
                 numExpectedRedirects = 0;
@@ -197,7 +200,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
             }
             // Verify that loadend / loaderror was called.
             if (e.type == 'exit') {
-                var numStopEvents = counts['loadstop'] + counts['loaderror'];
+                var numStopEvents = counts.loadstop + counts.loaderror;
                 if (numStopEvents === 0 && !wasReset) {
                     alert('Unexpected: browser closed without a loadstop or loaderror.');
                 } else if (numStopEvents > 1) {

www/windows8/InAppBrowserProxy.js

@@ -22,10 +22,6 @@
 /*jslint sloppy:true */
 /*global Windows:true, require, document, setTimeout, window, module */
 
-
-var cordova = require('cordova'),
-    channel = require('cordova/channel');
-
 var browserWrap;
 
 var IAB = {
@@ -45,7 +41,6 @@ var IAB = {
     open: function (win, lose, args) {
         var strUrl = args[0],
             target = args[1],
-            features = args[2],
             url,
             elem;