- removed iframe warning

- improved drag and drop look and feel on safari
dpgmediamagazines · Jun 3, 2018 · 2085029 · 2085029
1 parent 7478c74
commit 2085029
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/arctic/static/arctic/dist/assets/js/app.js b/arctic/static/arctic/dist/assets/js/app.js
diff --git a/arctic/static/arctic/package.json b/arctic/static/arctic/package.json
@@ -12,12 +12,24 @@
   },
   "dependencies": {
     "air-datepicker": "^2.2.3",
+    "bootstrap": "^4.1.1",
+    "font-awesome": "^4.7.0",
+    "iframe-resizer": "^3.6.1",
+    "jquery": "^3.3.1",
+    "js-yaml": "^3.11.0",
+    "popper.js": "^1.14.3",
+    "rimraf": "^2.6.2",
+    "sass-burger": "^1.3.1",
+    "selectize": "^0.12.4",
+    "sortablejs": "^1.7.0",
+    "yargs": "^11.1.0"
+  },
+  "devDependencies": {
+    "gulp-strip-comments": "^2.5.2",
     "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
     "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
     "babel-preset-es2015": "^6.24.1",
     "babel-register": "^6.26.0",
-    "bootstrap": "^4.1.1",
-    "font-awesome": "^4.7.0",
     "gulp": "^4.0.0",
     "gulp-autoprefixer": "^5.0.0",
     "gulp-babel": "^7.0.1",
@@ -31,16 +43,7 @@
     "gulp-sass": "^3.2.1",
     "gulp-sourcemaps": "^2.6.4",
     "gulp-uglify": "^3.0.0",
-    "gulp-uncss": "^1.0.6",
-    "iframe-resizer": "^3.6.1",
-    "jquery": "^3.3.1",
-    "js-yaml": "^3.11.0",
-    "popper.js": "^1.14.3",
-    "rimraf": "^2.6.2",
-    "sass-burger": "^1.3.1",
-    "selectize": "^0.12.4",
-    "sortablejs": "^1.7.0",
-    "yargs": "^11.1.0"
+    "gulp-uncss": "^1.0.6"
   },
   "babel": {
     "presets": [
@@ -62,8 +65,5 @@
     "url": "https://github.com/sanoma/django-arctic.git"
   },
   "bugs": "https://github.com/sanoma/django-arctic/issues",
-  "private": true,
-  "devDependencies": {
-    "gulp-strip-comments": "^2.5.2"
-  }
+  "private": true
 }
diff --git a/arctic/static/arctic/src/assets/js/components/modal.js b/arctic/static/arctic/src/assets/js/components/modal.js
@@ -8,6 +8,7 @@ $(document).ready(function() {
 
     $('iframe').iFrameResize({
         scrolling: true,
+        warningTimeout: 0,
         resizedCallback: function(messageData) {
             $('#iframe-modal').modal('handleUpdate');
         },

diff --git a/arctic/static/arctic/src/assets/js/components/widgets.js b/arctic/static/arctic/src/assets/js/components/widgets.js
@@ -218,6 +218,16 @@ $(document).ready(function() {
             }
         });
     });
+
+    $('[data-sorting-url] tr').on('dragstart', function(e) {
+        $(this).css('opacity', '0.5');
+        return true;
+    });
+
+    $('[data-sorting-url] tr').on('dragend', function(e) {
+        $(this).css('opacity', 'inherit');
+        return true;
+    });
 
 
     // tooltips