From 84bc07c07e73cb85ca68fa2973927a28993a872a Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Fri, 26 Jul 2013 23:29:09 +0200
Subject: [PATCH] misc. updates

---
 js/index.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/js/index.js b/js/index.js
index 3e989c9..e041dab 100644
--- a/js/index.js
+++ b/js/index.js
@@ -33,7 +33,21 @@ Ox.load('UI', function() {
                         + '/timeline' + type + '16p' + i + '.jpg';
                 },
                 height: window.innerHeight - 24,
-                layers: [
+                layers: [{
+                    id: 'image',
+                    item: 'Image',
+                    items: data['json/hashes.json'].filter(function(value) {
+                        return value.type == 'shape';
+                    }).map(function(value) {
+                        return {
+                            'in': value['in'],
+                            out: value.out,
+                            value: '<img src="' + value.composite + '">'
+                        }
+                    }),
+                    title: 'Images',
+                    type: 'text'
+                }].concat([
                     {id: 'shape', item: 'Shape Hash', title: 'Shape Hashes'},
                     {id: 'color', item: 'Color Hash', title: 'Color Hashes'},
                     {id: 'pHash', item: 'P Hash', title: 'P Hashes'},
@@ -48,7 +62,7 @@ Ox.load('UI', function() {
                             return {
                                 'in': value['in'],
                                 out: value.out,
-                                value: '<img src="' + value.composite + '"><br>' + value.hash + '<br>'
+                                value: value.hash + '<br>'
                                 + value.similar.map(function(value) {
                                     var position = Ox.formatDuration(value.position, 3);
                                     return '<a href="#' + position + '">' + position +'</a> ' + value.distance;
@@ -58,10 +72,10 @@ Ox.load('UI', function() {
                         title: layer.title,
                         type: 'text'
                     }
-                }),
+                })),
                 resolution: video.resolution,
                 showAnnotations: true,
-                showLayers: {shape: true, color: true, p: true, dct: true},
+                showLayers: {image: true, shape: true, color: true, pHash: true, dct: true},
                 subtitles: data['json/cuts1.json'].map(function(position) {
                     return {'in': position - 0.08, out: position - 0.04, text: ''};
                 }),