From 54896524c47a32c6d8d56370017508ffac0a8e47 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 12:28:32 +0100 Subject: [PATCH 01/22] First import windows first import --- plugin.xml | 7 +++++++ src/windows/SpinnerDialogProxy.js | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 src/windows/SpinnerDialogProxy.js diff --git a/plugin.xml b/plugin.xml index dc1137d..051249d 100644 --- a/plugin.xml +++ b/plugin.xml @@ -50,6 +50,13 @@ + + + + + + + diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js new file mode 100644 index 0000000..442d137 --- /dev/null +++ b/src/windows/SpinnerDialogProxy.js @@ -0,0 +1,5 @@ +cordova.commandProxy.add("SpinnerDialog", { + createEventWithOptions: function (successCallback, errorCallback, params) { + console.log("prova"); + } +}); \ No newline at end of file From 18a85fdbc62e2ced291e9105c9868f7f875bb4dd Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 12:43:13 +0100 Subject: [PATCH 02/22] commit test test --- src/windows/SpinnerDialogProxy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 442d137..813e692 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,5 +1,6 @@ cordova.commandProxy.add("SpinnerDialog", { createEventWithOptions: function (successCallback, errorCallback, params) { - console.log("prova"); + var msgBox = new Windows.UI.Popups.MessageDialog("prova"); + msgBox.showAsync(); } }); \ No newline at end of file From d4a6a20117d24fd2cebd9a953f3e890f8283c963 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 12:47:19 +0100 Subject: [PATCH 03/22] bugfix proxy bugfix proxy --- src/windows/SpinnerDialogProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 813e692..601d7be 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,5 +1,5 @@ cordova.commandProxy.add("SpinnerDialog", { - createEventWithOptions: function (successCallback, errorCallback, params) { + show: function (successCallback, errorCallback, params) { var msgBox = new Windows.UI.Popups.MessageDialog("prova"); msgBox.showAsync(); } From 5c8b2d4523ec096646cc50058e9abd3595586550 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 14:50:38 +0100 Subject: [PATCH 04/22] commit spinner spinner style --- src/windows/SpinnerDialogProxy.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 601d7be..f717b38 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,6 +1,15 @@ cordova.commandProxy.add("SpinnerDialog", { show: function (successCallback, errorCallback, params) { - var msgBox = new Windows.UI.Popups.MessageDialog("prova"); - msgBox.showAsync(); + //var msgBox = new Windows.UI.Popups.MessageDialog("prova"); + //msgBox.showAsync(); + var element = element || document.createElement("div"); + //element.style = "width:100%; height:100%; background-color: #000000"; + element.style.width = "100%"; + element.style.height = "100%"; + element.style.position = "relative"; + element.style.opacity = .5; //For real browsers; + element.style.filter = "alpha(opacity=50)"; //For IE; + element.style.background = "#000000"; + element.style.zIndex = 999999; } }); \ No newline at end of file From 7158af3c4b1d7fac690387e9378861dcafefa1de Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 14:53:12 +0100 Subject: [PATCH 05/22] fix z index fix z index --- src/windows/SpinnerDialogProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index f717b38..33af0d1 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -10,6 +10,6 @@ cordova.commandProxy.add("SpinnerDialog", { element.style.opacity = .5; //For real browsers; element.style.filter = "alpha(opacity=50)"; //For IE; element.style.background = "#000000"; - element.style.zIndex = 999999; + element.style.zIndex = "999999"; } }); \ No newline at end of file From 11059a707d8f44af791eae4553f5022f2be3f9cb Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 14:56:35 +0100 Subject: [PATCH 06/22] fix document append fix document append --- src/windows/SpinnerDialogProxy.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 33af0d1..27ea42c 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -11,5 +11,7 @@ cordova.commandProxy.add("SpinnerDialog", { element.style.filter = "alpha(opacity=50)"; //For IE; element.style.background = "#000000"; element.style.zIndex = "999999"; + + document.body.appendChild(element); } }); \ No newline at end of file From b66a5ebfee173562fb01a8c7a7509ad47098e86a Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 15:00:39 +0100 Subject: [PATCH 07/22] commmit innerHtml commmit innerHtml --- src/windows/SpinnerDialogProxy.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 27ea42c..02ddd8e 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,5 +1,5 @@ cordova.commandProxy.add("SpinnerDialog", { - show: function (successCallback, errorCallback, params) { + createEventWithOptions: function (successCallback, errorCallback, params) { //var msgBox = new Windows.UI.Popups.MessageDialog("prova"); //msgBox.showAsync(); var element = element || document.createElement("div"); @@ -12,6 +12,8 @@ cordova.commandProxy.add("SpinnerDialog", { element.style.background = "#000000"; element.style.zIndex = "999999"; + element.innerHTML = ""; + document.body.appendChild(element); } }); \ No newline at end of file From 16476b0768ae05ab318b453bea331bf254ea534d Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 15:04:38 +0100 Subject: [PATCH 08/22] commit spinner dialog proxy commit spinner dialog proxy --- src/windows/SpinnerDialogProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 02ddd8e..54ef7c6 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -12,7 +12,7 @@ cordova.commandProxy.add("SpinnerDialog", { element.style.background = "#000000"; element.style.zIndex = "999999"; - element.innerHTML = ""; + element.innerHTML = ""; document.body.appendChild(element); } From 61b06c1566234428ca185329adebb2b99fe525c5 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 15:13:08 +0100 Subject: [PATCH 09/22] missing show method missing show method --- src/windows/SpinnerDialogProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 54ef7c6..b6f6f3d 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,5 +1,5 @@ cordova.commandProxy.add("SpinnerDialog", { - createEventWithOptions: function (successCallback, errorCallback, params) { + show: function (successCallback, errorCallback, params) { //var msgBox = new Windows.UI.Popups.MessageDialog("prova"); //msgBox.showAsync(); var element = element || document.createElement("div"); From cfd175dfa435707eef11b9271bdd273723b7eb4b Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 19 Nov 2015 15:40:58 +0100 Subject: [PATCH 10/22] commit show/hide function commit show/hide function --- src/windows/SpinnerDialogProxy.js | 50 +++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index b6f6f3d..9cd113b 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,19 +1,37 @@ cordova.commandProxy.add("SpinnerDialog", { show: function (successCallback, errorCallback, params) { - //var msgBox = new Windows.UI.Popups.MessageDialog("prova"); - //msgBox.showAsync(); - var element = element || document.createElement("div"); - //element.style = "width:100%; height:100%; background-color: #000000"; - element.style.width = "100%"; - element.style.height = "100%"; - element.style.position = "relative"; - element.style.opacity = .5; //For real browsers; - element.style.filter = "alpha(opacity=50)"; //For IE; - element.style.background = "#000000"; - element.style.zIndex = "999999"; - - element.innerHTML = ""; - - document.body.appendChild(element); + if(!document.getElementById("SpinnerDialogPlugin")) + addSpinner(); + showSpinner(); + }, + hide: function (successCallback, errorCallback, params) { + hideSpinner(); } -}); \ No newline at end of file +}); + +function showSpinner(){ + var element = document.getElementById("SpinnerDialogPlugin"); + if(element) element.style.display = "block"; +}; + +function hideSpinner(){ + var element = document.getElementById("SpinnerDialogPlugin"); + if(element) element.style.display = "none"; +}; + +function addSpinner() { + var element = element || document.createElement("div"); + element.setAttribute("id", "SpinnerDialogPlugin"); + element.style.width = "100%"; + element.style.height = "100%"; + element.style.position = "relative"; + element.style.opacity = .5; //For real browsers; + element.style.filter = "alpha(opacity=50)"; //For IE; + element.style.background = "#000000"; + element.style.zIndex = "999999"; + element.style.display = "none"; + + element.innerHTML = ""; + + document.body.appendChild(element); +}; \ No newline at end of file From 281fe3193889240e1eb30eac1ab7dbbdcc05195b Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Fri, 20 Nov 2015 13:02:46 +0100 Subject: [PATCH 11/22] fix position absolute fix position absolute --- src/windows/SpinnerDialogProxy.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 9cd113b..4b7a08d 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -24,7 +24,9 @@ function addSpinner() { element.setAttribute("id", "SpinnerDialogPlugin"); element.style.width = "100%"; element.style.height = "100%"; - element.style.position = "relative"; + element.style.position = "absolute"; + element.style.top = "0px"; + element.style.left = "0px"; element.style.opacity = .5; //For real browsers; element.style.filter = "alpha(opacity=50)"; //For IE; element.style.background = "#000000"; From 01480b659455d4972a5506f34bf8b525dd09ef0a Mon Sep 17 00:00:00 2001 From: Paolo Messina Date: Fri, 22 Jan 2016 11:49:58 +0100 Subject: [PATCH 12/22] iOS - color param iOS - color param --- src/ios/CDVSpinnerDialog.m | 12 ++++++++++++ www/spinner.js | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/ios/CDVSpinnerDialog.m b/src/ios/CDVSpinnerDialog.m index a30dfd0..0cc8877 100644 --- a/src/ios/CDVSpinnerDialog.m +++ b/src/ios/CDVSpinnerDialog.m @@ -7,12 +7,15 @@ #import "CDVSpinnerDialog.h" +#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1] + @interface CDVSpinnerDialog () { UIActivityIndicatorView *indicator; NSString *callbackId; NSString *title; NSString *message; NSNumber *isFixed; + NSString *color; } @property (nonatomic, retain) UIActivityIndicatorView *indicator; @@ -52,6 +55,14 @@ - (UIView *)overlay { _overlay.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.35]; _indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; _indicator.center = _overlay.center; + if(color && ![color isEqualToString: @"null"] && ![color isEqualToString: @""]){ + if([color rangeOfString:@"#"].location != NSNotFound){ + color = [color stringByReplacingOccurrencesOfString:@"#" withString:@""]; + } + unsigned int baseValue; + [[NSScanner scannerWithString:color] scanHexInt:&baseValue]; + _indicator.color = UIColorFromRGB(baseValue); + } [_indicator startAnimating]; [_overlay addSubview:_indicator]; @@ -77,6 +88,7 @@ - (void) show:(CDVInvokedUrlCommand*)command { title = [command argumentAtIndex:0]; message = [command argumentAtIndex:1]; isFixed = [command argumentAtIndex:2]; + color = [command argumentAtIndex:3]; UIViewController *rootViewController = [[[[UIApplication sharedApplication] delegate] window] rootViewController]; diff --git a/www/spinner.js b/www/spinner.js index edc343a..81bb1fc 100644 --- a/www/spinner.js +++ b/www/spinner.js @@ -2,11 +2,11 @@ var exec = require('cordova/exec'); module.exports = { - show : function(title, message, cancelCallback) { + show : function(title, message, cancelCallback, color) { if (cancelCallback == true && typeof cancelCallback !== "function") { cancelCallback = function () {}; } - cordova.exec(cancelCallback, null, 'SpinnerDialog', 'show', [ title, message, !!cancelCallback ]); + cordova.exec(cancelCallback, null, 'SpinnerDialog', 'show', [ title, message, !!cancelCallback, color ]); }, From 3be7796bf09baa5ae2bb1150c30cff17cdd9b4f2 Mon Sep 17 00:00:00 2001 From: Paolo Messina Date: Fri, 22 Jan 2016 12:34:22 +0100 Subject: [PATCH 13/22] iOS - message color iOS - message color --- src/ios/CDVSpinnerDialog.m | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ios/CDVSpinnerDialog.m b/src/ios/CDVSpinnerDialog.m index 0cc8877..0b6b0cb 100644 --- a/src/ios/CDVSpinnerDialog.m +++ b/src/ios/CDVSpinnerDialog.m @@ -55,20 +55,28 @@ - (UIView *)overlay { _overlay.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.35]; _indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; _indicator.center = _overlay.center; - if(color && ![color isEqualToString: @"null"] && ![color isEqualToString: @""]){ + /*if(color && ![color isEqualToString: @"null"] && ![color isEqualToString: @""]){ if([color rangeOfString:@"#"].location != NSNotFound){ color = [color stringByReplacingOccurrencesOfString:@"#" withString:@""]; } unsigned int baseValue; [[NSScanner scannerWithString:color] scanHexInt:&baseValue]; _indicator.color = UIColorFromRGB(baseValue); - } + }*/ [_indicator startAnimating]; [_overlay addSubview:_indicator]; _messageView = [[UILabel alloc] initWithFrame: self.rectForView]; [_messageView setText: message == nil ? title : message]; - [_messageView setTextColor: [UIColor colorWithRed:1 green:1 blue:1 alpha:0.85]]; + //[_messageView setTextColor: [UIColor colorWithRed:1 green:1 blue:1 alpha:0.85]]; + if(color && ![color isEqualToString: @"null"] && ![color isEqualToString: @""]){ + if([color rangeOfString:@"#"].location != NSNotFound){ + color = [color stringByReplacingOccurrencesOfString:@"#" withString:@""]; + } + unsigned int baseValue; + [[NSScanner scannerWithString:color] scanHexInt:&baseValue]; + [_messageView setTextColor: UIColorFromRGB(baseValue)]; + } [_messageView setBackgroundColor: [UIColor colorWithRed:0 green:0 blue:0 alpha:0]]; [_messageView setTextAlignment: NSTextAlignmentCenter]; _messageView.center = (CGPoint){_overlay.center.x, _overlay.center.y + 40}; From cdedea4db383b9ae411bfacbdd89e4529f61d0ee Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Fri, 22 Jan 2016 15:22:28 +0100 Subject: [PATCH 14/22] ios - commit message windows ios - commit message windows --- src/windows/SpinnerDialogProxy.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 4b7a08d..bd1cc12 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -33,7 +33,23 @@ function addSpinner() { element.style.zIndex = "999999"; element.style.display = "none"; - element.innerHTML = ""; + var progressContainer = element || progressContainer.createElement("div"); + progressContainer.style.position = "absolute"; + progressContainer.style.top = "50%"; + progressContainer.style.left = "50%"; + progressContainer.style.transform = "translate(-50%, -50%)"; + + var progress = progress || document.createElement("progress"); + + var progressMessage = progressMessage|| document.createElement("div"); + progressMessage.style.marginTop = "2px;" + progressMessage.style.textAlign = "center"; + + progressContainer.appendChild(progress); + progressContainer.appendChild(progressMessage); + element.appendChild(progressContainer); + + //element.innerHTML = ""; document.body.appendChild(element); }; \ No newline at end of file From 7a82ac8db7a08bf0aedaef3685a320cbabe6e199 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Fri, 22 Jan 2016 15:32:53 +0100 Subject: [PATCH 15/22] windows commit message windows commit message --- src/windows/SpinnerDialogProxy.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index bd1cc12..68a7930 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -44,6 +44,7 @@ function addSpinner() { var progressMessage = progressMessage|| document.createElement("div"); progressMessage.style.marginTop = "2px;" progressMessage.style.textAlign = "center"; + progressMessage.innerHTML = params[1] ? params[1] : ""; progressContainer.appendChild(progress); progressContainer.appendChild(progressMessage); From 6884bb2b3cc5e782d62915fdcfc548a76cf1bf03 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Fri, 22 Jan 2016 16:00:37 +0100 Subject: [PATCH 16/22] windows message bug fix windows message bug fix --- src/windows/SpinnerDialogProxy.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 68a7930..3116491 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -1,7 +1,7 @@ cordova.commandProxy.add("SpinnerDialog", { show: function (successCallback, errorCallback, params) { if(!document.getElementById("SpinnerDialogPlugin")) - addSpinner(); + addSpinner(params); showSpinner(); }, hide: function (successCallback, errorCallback, params) { @@ -19,7 +19,7 @@ function hideSpinner(){ if(element) element.style.display = "none"; }; -function addSpinner() { +function addSpinner(params) { var element = element || document.createElement("div"); element.setAttribute("id", "SpinnerDialogPlugin"); element.style.width = "100%"; @@ -33,7 +33,7 @@ function addSpinner() { element.style.zIndex = "999999"; element.style.display = "none"; - var progressContainer = element || progressContainer.createElement("div"); + var progressContainer = progressContainer || document.createElement("div"); progressContainer.style.position = "absolute"; progressContainer.style.top = "50%"; progressContainer.style.left = "50%"; @@ -44,6 +44,7 @@ function addSpinner() { var progressMessage = progressMessage|| document.createElement("div"); progressMessage.style.marginTop = "2px;" progressMessage.style.textAlign = "center"; + progressMessage.style.color = params[3] ? params[3] : "#FFFFFF"; progressMessage.innerHTML = params[1] ? params[1] : ""; progressContainer.appendChild(progress); From ddbf8bab65385ce63e68c92f5bca82b47147db12 Mon Sep 17 00:00:00 2001 From: Paolo Messina Date: Mon, 25 Jan 2016 11:54:13 +0100 Subject: [PATCH 17/22] change opaciy change opacity --- src/ios/CDVSpinnerDialog.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ios/CDVSpinnerDialog.m b/src/ios/CDVSpinnerDialog.m index 0b6b0cb..b580fbb 100644 --- a/src/ios/CDVSpinnerDialog.m +++ b/src/ios/CDVSpinnerDialog.m @@ -52,7 +52,7 @@ - (void)handleTapGesture:(UITapGestureRecognizer *)gesture - (UIView *)overlay { if (!_overlay) { _overlay = [[UIView alloc] initWithFrame:self.rectForView]; - _overlay.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.35]; + _overlay.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.65]; _indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; _indicator.center = _overlay.center; /*if(color && ![color isEqualToString: @"null"] && ![color isEqualToString: @""]){ From 44bceb8f4eaa3e3c49859920839418fe4c171265 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 11 Feb 2016 17:20:26 +0100 Subject: [PATCH 18/22] commit bugfix manage add remove spinner with and without message --- src/windows/SpinnerDialogProxy.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 3116491..64a4566 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -2,7 +2,10 @@ cordova.commandProxy.add("SpinnerDialog", { show: function (successCallback, errorCallback, params) { if(!document.getElementById("SpinnerDialogPlugin")) addSpinner(params); - showSpinner(); + else { + hideSpinner(); + addSpinner(params); + } }, hide: function (successCallback, errorCallback, params) { hideSpinner(); @@ -16,7 +19,10 @@ function showSpinner(){ function hideSpinner(){ var element = document.getElementById("SpinnerDialogPlugin"); - if(element) element.style.display = "none"; + if(element) { + //element.style.display = "none"; + element.parentNode.removeChild(element); + } }; function addSpinner(params) { From f3ad4ce3bb062db7914900bcc7bfff23ced126b8 Mon Sep 17 00:00:00 2001 From: PaoloMessina Date: Thu, 11 Feb 2016 17:28:18 +0100 Subject: [PATCH 19/22] bugfix commit with display block --- src/windows/SpinnerDialogProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index 64a4566..cbab4ff 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -37,7 +37,7 @@ function addSpinner(params) { element.style.filter = "alpha(opacity=50)"; //For IE; element.style.background = "#000000"; element.style.zIndex = "999999"; - element.style.display = "none"; + //element.style.display = "none"; var progressContainer = progressContainer || document.createElement("div"); progressContainer.style.position = "absolute"; From 1aa31188f646ed7c465a17df9aa538ae675ad8df Mon Sep 17 00:00:00 2001 From: Paolo Messina Date: Mon, 22 Feb 2016 12:32:49 +0100 Subject: [PATCH 20/22] Adding multiline to message iOS Adding multiline to message iOS --- src/ios/CDVSpinnerDialog.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ios/CDVSpinnerDialog.m b/src/ios/CDVSpinnerDialog.m index b580fbb..d32352f 100644 --- a/src/ios/CDVSpinnerDialog.m +++ b/src/ios/CDVSpinnerDialog.m @@ -80,6 +80,8 @@ - (UIView *)overlay { [_messageView setBackgroundColor: [UIColor colorWithRed:0 green:0 blue:0 alpha:0]]; [_messageView setTextAlignment: NSTextAlignmentCenter]; _messageView.center = (CGPoint){_overlay.center.x, _overlay.center.y + 40}; + _messageView.lineBreakMode = NSLineBreakByWordWrapping; + _messageView.numberOfLines = 0; [_overlay addSubview:_messageView]; UITapGestureRecognizer *tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)]; From d07fd481be7438117de1f0deea9fceeb2350bf44 Mon Sep 17 00:00:00 2001 From: Paolo Messina Date: Tue, 12 Apr 2016 16:48:09 +0200 Subject: [PATCH 21/22] Windows backgorund color Windows backgorund color --- src/windows/SpinnerDialogProxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/SpinnerDialogProxy.js b/src/windows/SpinnerDialogProxy.js index cbab4ff..e3c9698 100644 --- a/src/windows/SpinnerDialogProxy.js +++ b/src/windows/SpinnerDialogProxy.js @@ -35,7 +35,7 @@ function addSpinner(params) { element.style.left = "0px"; element.style.opacity = .5; //For real browsers; element.style.filter = "alpha(opacity=50)"; //For IE; - element.style.background = "#000000"; + element.style.background = params[4] ? params[4] : "#000000"; element.style.zIndex = "999999"; //element.style.display = "none"; From 37b343832be7e922eecc3d19bffed5393598ad41 Mon Sep 17 00:00:00 2001 From: Paolo Messina Date: Mon, 16 May 2016 10:31:46 +0200 Subject: [PATCH 22/22] Android - fix background transparent Android - fix background transparent --- src/android/SpinnerDialog.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/android/SpinnerDialog.java b/src/android/SpinnerDialog.java index 41e6352..147c3a4 100644 --- a/src/android/SpinnerDialog.java +++ b/src/android/SpinnerDialog.java @@ -11,6 +11,7 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.widget.ProgressBar; +import android.graphics.drawable.ColorDrawable; public class SpinnerDialog extends CordovaPlugin { @@ -49,6 +50,7 @@ public void onCancel(DialogInterface dialog) { } if (title == null && message == null) { + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); dialog.setContentView(new ProgressBar(cordova.getActivity())); }