fixing directory preview image

bpatrik · Dec 10, 2018 · 25d145b · 25d145b
1 parent c98429a
commit 25d145b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,8 @@ common/**/*.js.map
 test/coverage
 test/backend/**/*.js
 test/backend/**/*.js.map
+test/common/**/*.js
+test/common/**/*.js.map
 test/e2e/**/*.js
 test/e2e/**/*.js.map
 demo/TEMP/
@@ -20,3 +22,4 @@ users.db
 sqlite.db
 dist/
 release/
+out-tsc/
diff --git a/backend/middlewares/user/AuthenticationMWs.ts b/backend/middlewares/user/AuthenticationMWs.ts
@@ -162,8 +162,6 @@ export class AuthenticationMWs {
         return null;
       }
 
-      console.log(sharing);
-
       if (Config.Client.Sharing.passwordProtected === true && (sharing.password)) {
         return null;
       }

diff --git a/frontend/app/gallery/directory/directory.gallery.component.html b/frontend/app/gallery/directory/directory.gallery.component.html
@@ -7,7 +7,7 @@
   <div class="photo-container"
        [style.width.px]="calcSize()"
        [style.height.px]="calcSize()">
-    <div [class]="'photo ' + (SamplePhoto ?  'photo-orientation-'+SamplePhoto.metadata.orientation : '')"
+    <div [ngClass]="'photo ' + (SamplePhoto ?  'photo-orientation-'+SamplePhoto.metadata.orientation : '')"
          *ngIf="thumbnail && thumbnail.Available"
          [style.background-image]="getSanitizedThUrl()"></div>
 

diff --git a/frontend/app/gallery/directory/directory.gallery.component.ts b/frontend/app/gallery/directory/directory.gallery.component.ts
@@ -37,8 +37,11 @@ export class GalleryDirectoryComponent implements OnInit, OnDestroy {
   }
 
   getSanitizedThUrl() {
-    return this._sanitizer.bypassSecurityTrustStyle('url(' + encodeURI(this.thumbnail.Src).replace(/\(/g, '%28')
-      .replace(/\)/g, '%29') + ')');
+    return this._sanitizer.bypassSecurityTrustStyle('url(' +
+      encodeURI(this.thumbnail.Src)
+        .replace(/\(/g, '%28')
+        .replace(/'/g, '%27')
+        .replace(/\)/g, '%29') + ')');
   }
 
   // TODO: implement scroll