Some fixes

Author: xnerhu

3-panel/src/imports/materialdesign/components/Dialog/index.js

@@ -37,10 +37,11 @@ export default class Dialog extends Component {
       this.toggled = true
 
       root.style.display = 'block'
+
       setTimeout(function () {
         root.style.opacity = '1'
         root.style.top = '50%'
-      }, 10)
+      }, 20)
 
       this.toggleDark(true)
     } else {
@@ -70,7 +71,7 @@ export default class Dialog extends Component {
 
       setTimeout(function () {
         dark.style.opacity = opacity
-      }, 10)
+      }, 20)
     } else {
       dark.style.opacity = '0'
 

3-panel/src/index.js

@@ -4,6 +4,6 @@ import UI from './helpers/UI'
 import './styles.scss'
 
 // Wait for sass load.
-setTimeout(function () {
+window.onload = function () {
   UI.render(new App(), document.getElementById('app'))
-}, 1)
+}

3-panel/src/views/App/index.js

@@ -383,9 +383,11 @@ export default class App extends Component {
     if (this.selectedPage === postsPage) {
       postsPage.onDeletePostsButtonClick
     } else if (this.selectedPage === galleryPage && galleryPage.elements.picturesDialog.toggledDeleteMode) {
-      const dialog = this.elements.deletePicturesDialog
+      const picturesDialog = galleryPage.elements.picturesDialog
 
-      dialog.elements.dialog.toggle(true)
+      if (picturesDialog.selectedPictures.length > 0) {
+        this.elements.deletePicturesDialog.elements.dialog.toggle(true)
+      }
     }
   }
 
@@ -419,15 +421,17 @@ export default class App extends Component {
         <EditCategoryDialog ref='editCategoryDialog' />
         <DeleteCategoryDialog ref='deleteCategoryDialog' />
         <DeletePicturesDialog ref='deletePicturesDialog' />
-        <Snackbar ref='deletedPostsSnackbar' text='Pomyślnie usunięto posty' />
-        <Snackbar ref='deletedPostSnackbar' text='Pomyślnie usunięto post' />
-        <Snackbar ref='addedPostSnackbar' text='Pomyślnie dodano post' />
-        <Snackbar ref='addedCategorySnackbar' text='Pomyślnie dodano kategorię' />
-        <Snackbar ref='editedCategorySnackbar' text='Pomyślnie edytowano kategorię' />
-        <Snackbar ref='addedPicturesSnackbar' text='Pomyślnie dodano zdjęcia' />
-        <Tooltip ref='tooltipView' text='Przełącz na liste' />
-        <Tooltip ref='tooltipShowPictures' text='Pokaż zdjęcia' />
-        <Tooltip ref='tooltipUploadButton' text='Najlepiej w proporcjach 16:9' />
+        <Snackbar ref='deletePostsSnackbar' text='Pomyślnie usunięto posty' />
+        <Snackbar ref='deletePostSnackbar' text='Pomyślnie usunięto post' />
+        <Snackbar ref='addPostSnackbar' text='Pomyślnie dodano post' />
+        <Snackbar ref='addCategorySnackbar' text='Pomyślnie dodano kategorię' />
+        <Snackbar ref='editCategorySnackbar' text='Pomyślnie edytowano kategorię' />
+        <Snackbar ref='deleteCategorySnackbar' text='Pomyślnie usunięto kategorię' />
+        <Snackbar ref='addPicturesSnackbar' text='Pomyślnie dodano zdjęcia' />
+        <Snackbar ref='deletePicturesSnackbar' text='Pomyślnie usunięto zdjęcia' />
+        <Tooltip ref='viewTooltip' text='Przełącz na liste' />
+        <Tooltip ref='showPicturesTooltip' text='Pokaż zdjęcia' />
+        <Tooltip ref='uploadButtonTooltip' text='Najlepiej w proporcjach 16:9' />
         <NavigationDrawer ref='navigationDrawer' />
         <Preloader className='data-preloader' ref='preloader' />
       </div>

3-panel/src/views/Pages/Gallery/components/AddCategoryDialog/index.js

@@ -59,7 +59,6 @@ export default class AddCategoryDialog extends Component {
 
         const app = window.app
 
-        const snackbar = window.app.elements.addedCategorySnackbar
         const gallery = app.getGalleryPage()
         const date = new Date()
 
@@ -89,7 +88,7 @@ export default class AddCategoryDialog extends Component {
         dialog.toggle(false)
         textField.setValue('')
         self.setDialogItems()
-        snackbar.toggle(true)
+        app.elements.addCategorySnackbar
       }, 500)
     }
   }

3-panel/src/views/Pages/Gallery/components/DeleteCategoryDialog/index.js

@@ -45,7 +45,9 @@ export default class AddCategoryDialog extends Component {
     const root = this.getRoot()
     const dialog = this.elements.dialog
 
-    const gallery = window.app.getGalleryPage()
+    const app = window.app
+
+    const gallery = app.getGalleryPage()
     const clickedPost = gallery.clickedCategory
     const index = gallery.categoriesData.indexOf(clickedPost.props.data)
 
@@ -54,15 +56,15 @@ export default class AddCategoryDialog extends Component {
     dialog.setItems([])
 
     setTimeout(function () {
+      root.classList.remove('category-dialog-preloader')
+
       gallery.categoriesData[index].removed = true
 
       gallery.reloadSections()
-
-      root.classList.remove('category-dialog-preloader')
-
       self.setDialogItems()
-
       dialog.toggle(false)
+
+      app.elements.deleteCategorySnackbar.toggle(true)
     }, 500)
   }
 

3-panel/src/views/Pages/Gallery/components/DeletePicturesDialog/index.js

@@ -71,9 +71,10 @@ export default class DeletePicturesDialog extends Component {
       root.classList.remove('category-dialog-preloader')
 
       picturesDialog.toggleDeleteMode(false)
-
+      picturesDialog.setPicturesCount()
       self.setDialogItems()
       dialog.toggle(false)
+      app.elements.deletePicturesSnackbar.toggle(true)
     }, 500)
   }
 

3-panel/src/views/Pages/Gallery/components/EditCategoryDialog/index.js

@@ -82,12 +82,10 @@ export default class EditCategoryDialog extends Component {
           categoriesData[index].name = title
           clickedCategory.elements.title.innerHTML = title
 
-          const snackbar = app.elements.editedCategorySnackbar
-
           dialog.toggle(false)
           textField.setValue('')
           self.setDialogItems()
-          snackbar.toggle(true)
+          app.elements.editCategorySnackbar.toggle(true)
         }, 500)
       }
     }

3-panel/src/views/Pages/Gallery/components/UploadPicturesDialog/index.js

@@ -148,11 +148,10 @@ export default class UploadPicturesDialog extends Component {
       console.log('Index is less than 0')
     }
 
-    picturesDialog.setPicturesCount()
+    if (picturesDialog.toggled) picturesDialog.setPicturesCount()
 
     this.toggle(false)
-
-    app.elements.addedPicturesSnackbar.toggle(true)
+    app.elements.addPicturesSnackbar.toggle(true)
   }
 
   /**