Skip to content

Commit

Permalink
Release 3.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Clement authored and Clement committed May 8, 2017
1 parent 87c53e7 commit 0c20f12
Show file tree
Hide file tree
Showing 2,714 changed files with 344,645 additions and 73 deletions.
4 changes: 2 additions & 2 deletions MOLPayXDKExample/platforms/android/android.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@
],
"plugin_metadata": {
"cordova-plugin-android-permissions": "0.10.0",
"cordova-plugin-inappbrowser": "1.7.0",
"cordova-plugin-inappbrowser": "1.7.1",
"cordova-plugin-privacyscreen": "0.3.1",
"cordova-plugin-whitelist": "1.3.2",
"cordova-plugin-x-toast": "2.6.0",
"cordova-save-image-gallery": "0.0.26",
"molpay-mobile-xdk-cordova": "3.11.0"
"molpay-mobile-xdk-cordova": "3.12.0"
}
}
4 changes: 2 additions & 2 deletions MOLPayXDKExample/platforms/android/assets/www/cordova_plugins.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ module.exports.metadata =
// TOP OF METADATA
{
"cordova-plugin-android-permissions": "0.10.0",
"cordova-plugin-inappbrowser": "1.7.0",
"cordova-plugin-inappbrowser": "1.7.1",
"cordova-plugin-privacyscreen": "0.3.1",
"cordova-plugin-whitelist": "1.3.2",
"cordova-plugin-x-toast": "2.6.0",
"cordova-save-image-gallery": "0.0.26",
"molpay-mobile-xdk-cordova": "3.11.0"
"molpay-mobile-xdk-cordova": "3.12.0"
};
// BOTTOM OF METADATA
});
4 changes: 3 additions & 1 deletion MOLPayXDKExample/platforms/android/assets/www/js/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ var app = {
// 'mp_bill_name_edit_disabled': true, // Optional, explicitly force disable billing name edit.
// 'mp_bill_email_edit_disabled': true, // Optional, explicitly force disable billing email edit.
// 'mp_bill_mobile_edit_disabled': true, // Optional, explicitly force disable billing mobile edit.
// 'mp_bill_description_edit_disabled': true // Optional, explicitly force disable billing description edit.
// 'mp_bill_description_edit_disabled': true, // Optional, explicitly force disable billing description edit.
// 'mp_language': 'EN', // Optional, EN, MS, VI, TH, FIL, MY, KM, ID, ZH.
// 'mp_dev_mode': false // Optional, enable for online sandbox testing.
};

var molpayCallback = function (transactionResult) {
Expand Down
2 changes: 1 addition & 1 deletion MOLPayXDKExample/platforms/android/assets/www/molpay-mobile-xdk-www/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.88dcea2c.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.js"></script> </body> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.88dcea2c.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.69e44cc3.js"></script> </body> </html>
1 change: 1 addition & 0 deletions ...XDKExample/platforms/android/assets/www/molpay-mobile-xdk-www/scripts/scripts.69e44cc3.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MOLPayXDKExample/platforms/android/platform_www/cordova_plugins.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ module.exports.metadata =
// TOP OF METADATA
{
"cordova-plugin-android-permissions": "0.10.0",
"cordova-plugin-inappbrowser": "1.7.0",
"cordova-plugin-inappbrowser": "1.7.1",
"cordova-plugin-privacyscreen": "0.3.1",
"cordova-plugin-whitelist": "1.3.2",
"cordova-plugin-x-toast": "2.6.0",
"cordova-save-image-gallery": "0.0.26",
"molpay-mobile-xdk-cordova": "3.11.0"
"molpay-mobile-xdk-cordova": "3.12.0"
};
// BOTTOM OF METADATA
});
2 changes: 1 addition & 1 deletion MOLPayXDKExample/platforms/android/platform_www/molpay-mobile-xdk-www/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.88dcea2c.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.js"></script> </body> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.88dcea2c.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.69e44cc3.js"></script> </body> </html>
1 change: 1 addition & 0 deletions ...KExample/platforms/android/platform_www/molpay-mobile-xdk-www/scripts/scripts.69e44cc3.js
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions MOLPayXDKExample/platforms/android/src/org/apache/cordova/inappbrowser/InAppBrowser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,10 @@ public void onPageFinished(WebView view, String url) {
CookieSyncManager.getInstance().sync();
}

// https://issues.apache.org/jira/browse/CB-11248
view.clearFocus();
view.requestFocus();

try {
JSONObject obj = new JSONObject();
obj.put("type", LOAD_STOP_EVENT);
Expand Down
Loading

0 comments on commit 0c20f12

Please sign in to comment.