CLIP-46 #time 2h 40m Fixed Safari browser issues @resolve

closed #57
leftshifters · Sep 15, 2015 · aec6786 · aec6786
1 parent 5a703f0
commit aec6786
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 123 deletions.
diff --git a/src/actions/ClipActions.js b/src/actions/ClipActions.js
@@ -9,12 +9,13 @@ import Dispatcher from '../core/Dispatcher';
 import apiUtils from '../utils/apiUtils';
 
 const log = debug('clipboard:clipaction');
+const isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
 
 export default {
   getClips(page) {
     apiUtils.getClips(page)
       .then((res) => {
-        log('Got clips in actions %o', res);
+        console.log('Got clips in actions %o', res);
         Dispatcher.dispatch({
           actionType: SET_CLIPS,
           payload: {
@@ -94,7 +95,7 @@ export default {
         Dispatcher.dispatch({
           actionType: GOT_SUCCESS,
           payload: {
-            success: 'Successfully title change'
+            success: 'Changed title successfully'
           }
         });
       })
@@ -132,10 +133,12 @@ export default {
     apiUtils
       .tempClip(clip)
       .then((res) => {
-        Dispatcher.dispatch({
-          actionType: UPLOADING_CLIP,
-          payload: res
-        });
+        if(!isSafari) {
+          Dispatcher.dispatch({
+            actionType: UPLOADING_CLIP,
+            payload: res
+          });
+        }
 
         apiUtils
           .addClip(res.clip, data)

diff --git a/src/components/ClipApp/ClipApp.js b/src/components/ClipApp/ClipApp.js
@@ -140,7 +140,6 @@ class ClipApp extends React.Component {
 
   render() {
     log('Rendering clip view');
-
     return (
       <Container
         onDragEnter={this.handleDragEnter.bind(this)}

diff --git a/src/components/Notify/Notify.js b/src/components/Notify/Notify.js
@@ -21,6 +21,7 @@ class Notify extends React.Component {
   }
 
   addNotification() {
+    console.log(this.state.error);
     this.notificationSystem.addNotification({
       message: this.state.error ? this.state.error.message : this.state.success,
       level: this.state.error ? 'error' : 'success',