Replaced all images, upadted config

andyzg · Jan 9, 2017 · fb94d48 · fb94d48
1 parent e5359db
commit fb94d48
Show file tree

Hide file tree

Showing 43 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 _site/
+node_modules/
diff --git a/cambodia/IMG_7076.jpg b/cambodia/IMG_7076.jpg
diff --git a/cambodia/IMG_7136.jpg b/cambodia/IMG_7136.jpg
diff --git a/cambodia/IMG_7137.jpg b/cambodia/IMG_7137.jpg
diff --git a/cambodia/IMG_7184.jpg b/cambodia/IMG_7184.jpg
diff --git a/cambodia/IMG_7199.jpg b/cambodia/IMG_7199.jpg
diff --git a/cambodia/IMG_7215.jpg b/cambodia/IMG_7215.jpg
diff --git a/cambodia/IMG_7575.jpg b/cambodia/IMG_7575.jpg
diff --git a/cambodia/IMG_7581.jpg b/cambodia/IMG_7581.jpg
diff --git a/cambodia/IMG_7593.jpg b/cambodia/IMG_7593.jpg
diff --git a/cambodia/IMG_7609.jpg b/cambodia/IMG_7609.jpg
diff --git a/cambodia/cambodia-1.jpg b/cambodia/cambodia-1.jpg
diff --git a/cambodia/cambodia-10.jpg b/cambodia/cambodia-10.jpg
diff --git a/cambodia/cambodia-2.jpg b/cambodia/cambodia-2.jpg
diff --git a/cambodia/cambodia-3.jpg b/cambodia/cambodia-3.jpg
diff --git a/cambodia/cambodia-4.jpg b/cambodia/cambodia-4.jpg
diff --git a/cambodia/cambodia-5.jpg b/cambodia/cambodia-5.jpg
diff --git a/cambodia/cambodia-6.jpg b/cambodia/cambodia-6.jpg
diff --git a/cambodia/cambodia-7.jpg b/cambodia/cambodia-7.jpg
diff --git a/cambodia/cambodia-8.jpg b/cambodia/cambodia-8.jpg
diff --git a/cambodia/cambodia-9.jpg b/cambodia/cambodia-9.jpg
diff --git a/config.json b/config.json
@@ -1 +1 @@
-{"cambodia":[{"width":3509,"height":2632,"path":"cambodia/cambodia-1.jpg"},{"width":3797,"height":2848,"path":"cambodia/cambodia-10.jpg"},{"width":2821,"height":3761,"path":"cambodia/cambodia-2.jpg"},{"width":2136,"height":2848,"path":"cambodia/cambodia-3.jpg"},{"width":4272,"height":2848,"path":"cambodia/cambodia-4.jpg"},{"width":3244,"height":2433,"path":"cambodia/cambodia-5.jpg"},{"width":3797,"height":2848,"path":"cambodia/cambodia-6.jpg"},{"width":3797,"height":2848,"path":"cambodia/cambodia-7.jpg"},{"width":3441,"height":2581,"path":"cambodia/cambodia-8.jpg"},{"width":2848,"height":4272,"path":"cambodia/cambodia-9.jpg"}],"hongkong":[{"width":3797,"height":2848,"path":"hongkong/hongkong-1.jpg"},{"width":2130,"height":2840,"path":"hongkong/hongkong-10.jpg"},{"width":4272,"height":2848,"path":"hongkong/hongkong-2.jpg"},{"width":2541,"height":3388,"path":"hongkong/hongkong-3.jpg"},{"width":4272,"height":2403,"path":"hongkong/hongkong-4.jpg"},{"width":4272,"height":2848,"path":"hongkong/hongkong-5.jpg"},{"width":2848,"height":4272,"path":"hongkong/hongkong-6.jpg"},{"width":3797,"height":2848,"path":"hongkong/hongkong-7.jpg"},{"width":4272,"height":2848,"path":"hongkong/hongkong-8.jpg"},{"width":2848,"height":2848,"path":"hongkong/hongkong-9.jpg"}]}
+{"cambodia":[{"width":2000,"height":1500,"path":"cambodia/IMG_7076.jpg"},{"width":1500,"height":2000,"path":"cambodia/IMG_7136.jpg"},{"width":1500,"height":2000,"path":"cambodia/IMG_7137.jpg"},{"width":2000,"height":1333,"path":"cambodia/IMG_7184.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7199.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7215.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7575.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7581.jpg"},{"width":1333,"height":2000,"path":"cambodia/IMG_7593.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7609.jpg"}],"hongkong":[{"width":2000,"height":1333,"path":"hongkong/IMG_0067.jpg"},{"width":2000,"height":2000,"path":"hongkong/IMG_0191.jpg"},{"width":1500,"height":2000,"path":"hongkong/IMG_6427.jpg"},{"width":2000,"height":1500,"path":"hongkong/IMG_9640.jpg"},{"width":2000,"height":1333,"path":"hongkong/IMG_9675.jpg"},{"width":1500,"height":2000,"path":"hongkong/IMG_9863.jpg"},{"width":2000,"height":1125,"path":"hongkong/IMG_9892.jpg"},{"width":2000,"height":1333,"path":"hongkong/IMG_9905.jpg"},{"width":1333,"height":2000,"path":"hongkong/IMG_9966.jpg"},{"width":2000,"height":1500,"path":"hongkong/IMG_9972.jpg"}]}
diff --git a/gallery.js b/gallery.js
@@ -70,8 +70,10 @@ var Gallery = (function() {
 
     for (var i = 0; i < photos.length; i++) {
       var photo = photos[i];
-      var image = new Image(photo.getWidth(finalHeight), finalHeight);
+      var image = new Image();
       image.src = photo.getPath();
+      image.style.width = photo.getWidth(finalHeight) + 'px';
+      image.style.height = finalHeight + 'px';
       if (i !== 0) {
         image.style.marginLeft = this._spacing + 'px';
       }

diff --git a/hongkong/IMG_0067.jpg b/hongkong/IMG_0067.jpg
diff --git a/hongkong/IMG_0191.jpg b/hongkong/IMG_0191.jpg
diff --git a/hongkong/IMG_6427.jpg b/hongkong/IMG_6427.jpg
diff --git a/hongkong/IMG_9640.jpg b/hongkong/IMG_9640.jpg
diff --git a/hongkong/IMG_9675.jpg b/hongkong/IMG_9675.jpg
diff --git a/hongkong/IMG_9863.jpg b/hongkong/IMG_9863.jpg
diff --git a/hongkong/IMG_9892.jpg b/hongkong/IMG_9892.jpg
diff --git a/hongkong/IMG_9905.jpg b/hongkong/IMG_9905.jpg
diff --git a/hongkong/IMG_9966.jpg b/hongkong/IMG_9966.jpg
diff --git a/hongkong/IMG_9972.jpg b/hongkong/IMG_9972.jpg
diff --git a/hongkong/hongkong-1.jpg b/hongkong/hongkong-1.jpg
diff --git a/hongkong/hongkong-10.jpg b/hongkong/hongkong-10.jpg
diff --git a/hongkong/hongkong-2.jpg b/hongkong/hongkong-2.jpg
diff --git a/hongkong/hongkong-3.jpg b/hongkong/hongkong-3.jpg
diff --git a/hongkong/hongkong-4.jpg b/hongkong/hongkong-4.jpg
diff --git a/hongkong/hongkong-5.jpg b/hongkong/hongkong-5.jpg
diff --git a/hongkong/hongkong-6.jpg b/hongkong/hongkong-6.jpg
diff --git a/hongkong/hongkong-7.jpg b/hongkong/hongkong-7.jpg
diff --git a/hongkong/hongkong-8.jpg b/hongkong/hongkong-8.jpg
diff --git a/hongkong/hongkong-9.jpg b/hongkong/hongkong-9.jpg
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"cambodia":[{"width":3509,"height":2632,"path":"cambodia/cambodia-1.jpg"},{"width":3797,"height":2848,"path":"cambodia/cambodia-10.jpg"},{"width":2821,"height":3761,"path":"cambodia/cambodia-2.jpg"},{"width":2136,"height":2848,"path":"cambodia/cambodia-3.jpg"},{"width":4272,"height":2848,"path":"cambodia/cambodia-4.jpg"},{"width":3244,"height":2433,"path":"cambodia/cambodia-5.jpg"},{"width":3797,"height":2848,"path":"cambodia/cambodia-6.jpg"},{"width":3797,"height":2848,"path":"cambodia/cambodia-7.jpg"},{"width":3441,"height":2581,"path":"cambodia/cambodia-8.jpg"},{"width":2848,"height":4272,"path":"cambodia/cambodia-9.jpg"}],"hongkong":[{"width":3797,"height":2848,"path":"hongkong/hongkong-1.jpg"},{"width":2130,"height":2840,"path":"hongkong/hongkong-10.jpg"},{"width":4272,"height":2848,"path":"hongkong/hongkong-2.jpg"},{"width":2541,"height":3388,"path":"hongkong/hongkong-3.jpg"},{"width":4272,"height":2403,"path":"hongkong/hongkong-4.jpg"},{"width":4272,"height":2848,"path":"hongkong/hongkong-5.jpg"},{"width":2848,"height":4272,"path":"hongkong/hongkong-6.jpg"},{"width":3797,"height":2848,"path":"hongkong/hongkong-7.jpg"},{"width":4272,"height":2848,"path":"hongkong/hongkong-8.jpg"},{"width":2848,"height":2848,"path":"hongkong/hongkong-9.jpg"}]}
		{"cambodia":[{"width":2000,"height":1500,"path":"cambodia/IMG_7076.jpg"},{"width":1500,"height":2000,"path":"cambodia/IMG_7136.jpg"},{"width":1500,"height":2000,"path":"cambodia/IMG_7137.jpg"},{"width":2000,"height":1333,"path":"cambodia/IMG_7184.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7199.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7215.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7575.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7581.jpg"},{"width":1333,"height":2000,"path":"cambodia/IMG_7593.jpg"},{"width":2000,"height":1500,"path":"cambodia/IMG_7609.jpg"}],"hongkong":[{"width":2000,"height":1333,"path":"hongkong/IMG_0067.jpg"},{"width":2000,"height":2000,"path":"hongkong/IMG_0191.jpg"},{"width":1500,"height":2000,"path":"hongkong/IMG_6427.jpg"},{"width":2000,"height":1500,"path":"hongkong/IMG_9640.jpg"},{"width":2000,"height":1333,"path":"hongkong/IMG_9675.jpg"},{"width":1500,"height":2000,"path":"hongkong/IMG_9863.jpg"},{"width":2000,"height":1125,"path":"hongkong/IMG_9892.jpg"},{"width":2000,"height":1333,"path":"hongkong/IMG_9905.jpg"},{"width":1333,"height":2000,"path":"hongkong/IMG_9966.jpg"},{"width":2000,"height":1500,"path":"hongkong/IMG_9972.jpg"}]}