@@ -2093,6 +2093,7 @@ Vvveb.Builder = {
2093
2093
doc . querySelectorAll ( "[contenteditable]" ) . forEach ( e => e . removeAttribute ( "contenteditable" ) ) ;
2094
2094
doc . querySelectorAll ( "[spellcheckker]" ) . forEach ( e => e . removeAttribute ( "spellcheckker" ) ) ;
2095
2095
doc . querySelectorAll ( 'script[src^="chrome-extension://"]' ) . forEach ( e => e . remove ( ) ) ;
2096
+ doc . querySelectorAll ( 'script[src^="moz-extension://"]' ) . forEach ( e => e . remove ( ) ) ;
2096
2097
2097
2098
// scroll page to top to avoid saving the page in a different state
2098
2099
// like saving with sticky classes set for navbar etc
@@ -2223,8 +2224,8 @@ Vvveb.Builder = {
2223
2224
body : nestedFormData ( data )
2224
2225
} )
2225
2226
. then ( ( response ) => {
2226
- if ( ! response . ok ) { throw new Error ( response ) }
2227
- return response . json ( )
2227
+ if ( ! response . ok ) { return Promise . reject ( response ) ; }
2228
+ return response . json ( ) ;
2228
2229
} )
2229
2230
. then ( ( data ) => {
2230
2231
if ( callback ) callback ( data ) ;
@@ -2233,7 +2234,13 @@ Vvveb.Builder = {
2233
2234
} )
2234
2235
. catch ( ( err ) => {
2235
2236
if ( error ) error ( err ) ;
2236
- displayToast ( "bg-danger" , "Error" , "Error saving!" ) ;
2237
+ let message = error . statusText ?? "Error saving!" ;
2238
+ displayToast ( "bg-danger" , "Error" , message ) ;
2239
+
2240
+ err . text ( ) . then ( errorMessage => {
2241
+ let message = errorMessage . substr ( 0 , 200 ) ;
2242
+ displayToast ( "bg-danger" , "Error" , message ) ;
2243
+ } )
2237
2244
} ) ;
2238
2245
} ,
2239
2246
@@ -2475,8 +2482,8 @@ Vvveb.Gui = {
2475
2482
} , ( error ) => {
2476
2483
document . querySelector ( ".loading" , btn ) . classList . toggle ( "d-none" ) ;
2477
2484
document . querySelector ( ".button-text" , btn ) . classList . toggle ( "d-none" ) ;
2478
-
2479
- displayToast ( "bg-danger" , "Error" , "Error saving!" ) ;
2485
+ let message = error . statusText ?? "Error saving!" ;
2486
+ displayToast ( "bg-danger" , "Error" , message ) ;
2480
2487
} ) ;
2481
2488
} ,
2482
2489
@@ -2677,9 +2684,11 @@ Vvveb.StyleManager = {
2677
2684
cssContainer :false ,
2678
2685
mobileWidth : '320px' ,
2679
2686
tabletWidth : '768px' ,
2687
+ doc :false ,
2680
2688
2681
2689
init : function ( doc ) {
2682
2690
if ( doc ) {
2691
+ this . doc = doc ;
2683
2692
2684
2693
let style = false ;
2685
2694
let _style = false ;
@@ -2844,6 +2853,9 @@ Vvveb.StyleManager = {
2844
2853
//this.cssContainer.innerHTML = css;
2845
2854
2846
2855
//return element;
2856
+ //refresh container element to avoid issues with changes from code editor
2857
+ this . cssContainer = this . doc . getElementById ( "vvvebjs-styles" ) ;
2858
+
2847
2859
let css = "" ;
2848
2860
for ( media in this . styles ) {
2849
2861
if ( media === "tablet" || media === "mobile" ) {
@@ -3556,7 +3568,7 @@ Vvveb.FileManager = {
3556
3568
3557
3569
fetch ( deleteFileUrl , { method : "POST" , body : new URLSearchParams ( { file :page . file , post_id} ) } )
3558
3570
. then ( ( response ) => {
3559
- if ( ! response . ok ) { throw new Error ( response ) }
3571
+ if ( ! response . ok ) { return Promise . reject ( response ) ; }
3560
3572
return response . json ( )
3561
3573
} )
3562
3574
. then ( ( data ) => {
@@ -3570,8 +3582,14 @@ Vvveb.FileManager = {
3570
3582
displayToast ( bg , "Delete" , data . message ?? data ) ;
3571
3583
} )
3572
3584
. catch ( error => {
3573
- console . log ( error . statusText ) ;
3574
- displayToast ( "bg-danger" , "Error" , "Error deleting page!" ) ;
3585
+ console . log ( error ) ;
3586
+ let message = error . statusText ?? "Error deleting page!" ;
3587
+ displayToast ( "bg-danger" , "Error" , message ) ;
3588
+
3589
+ err . text ( ) . then ( errorMessage => {
3590
+ let message = errorMessage . substr ( 0 , 200 ) ;
3591
+ displayToast ( "bg-danger" , "Error" , message ) ;
3592
+ } )
3575
3593
} ) ;
3576
3594
3577
3595
element . remove ( ) ;
@@ -3606,7 +3624,7 @@ Vvveb.FileManager = {
3606
3624
3607
3625
fetch ( renameFileUrl , { method : "POST" , body : new URLSearchParams ( { file :page . file , newfile :newfile , name, duplicate, post_id} ) } )
3608
3626
. then ( ( response ) => {
3609
- if ( ! response . ok ) { throw new Error ( response ) }
3627
+ if ( ! response . ok ) { return Promise . reject ( response ) ; }
3610
3628
return response . json ( )
3611
3629
} )
3612
3630
. then ( ( data ) => {
@@ -3640,7 +3658,13 @@ Vvveb.FileManager = {
3640
3658
} )
3641
3659
. catch ( error => {
3642
3660
console . log ( error ) ;
3643
- displayToast ( "bg-danger" , "Error" , "Error renaming page!" ) ;
3661
+ let message = error . statusText ?? "Error renaming page!" ;
3662
+ displayToast ( "bg-danger" , "Error" , message ) ;
3663
+
3664
+ err . text ( ) . then ( errorMessage => {
3665
+ let message = errorMessage . substr ( 0 , 200 ) ;
3666
+ displayToast ( "bg-danger" , "Error" , message ) ;
3667
+ } )
3644
3668
} ) ;
3645
3669
}
3646
3670
}
0 commit comments