Browse Source

1.1.2

master
ramswaroop 3 years ago
committed by Niduroki
parent
commit
bd0d0ae2d7
5 changed files with 18 additions and 16 deletions
  1. +1
    -0
      .idea/photography.iml
  2. +1
    -1
      README.md
  3. +12
    -11
      assets/js/main.js
  4. +3
    -3
      index.html
  5. +1
    -1
      package.json

+ 1
- 0
.idea/photography.iml View File

@ -5,5 +5,6 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="photography node_modules" level="project" />
</component>
</module>

+ 1
- 1
README.md View File

@ -29,7 +29,7 @@ and thumbnail generation__. So if you're lazy like me then you can just do the f
4. `$ gulp` to resize the images and to generate thumbnails for faster page loads
5. Push your changes to github.com by `$ git commit -am "a nice commit message"` and then `$ git push origin master`
## Contributors
## Credits
Thanks to [AJ](https://twitter.com/ajlkn) for the website template which I enhanced for [jekyll](http://jekyllrb.com/).

+ 12
- 11
assets/js/main.js View File

@ -215,7 +215,8 @@
});
// Main.
var $main = $('#main');
var $main = $('#main'),
exifDatas = {};
// Thumbs.
$main.children('.thumb').each(function () {
@ -254,7 +255,7 @@
// EXIF data
EXIF.getData($image_img[0], function () {
$this.children('p').html(getExifDataMarkup(this));
exifDatas[$image_img.data('name')] = getExifDataMarkup(this);
});
});
@ -263,15 +264,15 @@
$main.poptrox({
baseZIndex: 20000,
caption: function ($a) {
var s = '';
$a.nextAll().each(function () {
s += this.outerHTML;
});
return s;
var $image_img = $a.children('img');
var data = exifDatas[$image_img.data('name')];
if (data === undefined) {
// EXIF data
EXIF.getData($image_img[0], function () {
data = exifDatas[$image_img.data('name')] = getExifDataMarkup(this);
});
}
return data !== undefined ? '<p>' + data + '</p>' : ' ';
},
fadeSpeed: 300,
onPopupClose: function () {


+ 3
- 3
index.html View File

@ -21,9 +21,9 @@ layout: default
{% if image.path contains 'fulls' %}
<article class="thumb">
<a href="{{ site.baseurl }}{{ site.image_fulls_loc }}/{{ image.name }}" class="image">
<img src="{{ site.baseurl }}{{ site.image_thumbs_loc }}/{{ image.name }}" alt=""/></a>
<h2></h2>
<p></p>
<img src="{{ site.baseurl }}{{ site.image_thumbs_loc }}/{{ image.name }}" alt="" data-name="{{ image.name }}"/></a>
<!--<h2></h2>
<p></p>-->
</article>
{% endif %}
{% endfor %}


+ 1
- 1
package.json View File

@ -1,6 +1,6 @@
{
"name": "photography",
"version": "1.1.1",
"version": "1.1.2",
"description": "A jekyll website for photographer cum developer",
"main": "npmfile.js",
"scripts": {


Loading…
Cancel
Save