fixes for loading gallery from different directories, firefox issues

mnutt · Nov 9, 2015 · a3a27dc · a3a27dc
1 parent 190ac03
commit a3a27dc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/app/mixins/directory/gallery.js b/app/mixins/directory/gallery.js
@@ -1,7 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Mixin.create({
-  directoryGallery: null,
+  galleryEnabled: false,
+
   directoryGalleryItems: function() {
     return this.get('model.sortedFiles').filter((file) => {
       return file.get('type') === "image";
@@ -13,7 +14,7 @@ export default Ember.Mixin.create({
 
   actions: {
     slideshow: function() {
-      this.get('directoryGallery').init();
+      this.set('galleryEnabled', true);
     }
   }
 });
diff --git a/app/styles/file.scss b/app/styles/file.scss
@@ -92,3 +92,8 @@
     }
   }
 }
+
+.pswp__zoom-wrap {
+  will-change: auto !important;
+  -webkit-backface-visibility: visible !important;
+}
diff --git a/app/templates/plugins/gallery.hbs b/app/templates/plugins/gallery.hbs
@@ -1 +1 @@
-{{photo-swipe gallery=directoryGallery options=galleryOptions items=directoryGalleryItems}}
+{{photo-swipe enabled=galleryEnabled options=galleryOptions items=directoryGalleryItems}}
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-moment-shim": "0.6.2",
-    "ember-cli-photoswipe": "git://github.com/mnutt/ember-cli-photoswipe.git#adb0aa1",
+    "ember-cli-photoswipe": "git://github.com/mnutt/ember-cli-photoswipe.git#f5bfce5",
     "ember-cli-qunit": "0.3.15",
     "ember-cli-release": "0.2.3",
     "ember-cli-sass": "4.0.1",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{photo-swipe gallery=directoryGallery options=galleryOptions items=directoryGalleryItems}}
		{{photo-swipe enabled=galleryEnabled options=galleryOptions items=directoryGalleryItems}}