From a322623934dfe5c54f7948cd917cc77009feb10b Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sat, 9 Jan 2016 04:59:57 +0300
Subject: [PATCH] some bugfixes and more work on exif...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/exif.js       | 28 ++++++++++++++++++++++++++++
 ui (gen4)/features/filesystem.js |  2 +-
 ui (gen4)/lib/widget/browse.js   | 17 ++++++++++++-----
 ui (gen4)/lib/widget/widget.js   |  1 +
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/ui (gen4)/features/exif.js b/ui (gen4)/features/exif.js
index faa10c9d..fbc26e42 100755
--- a/ui (gen4)/features/exif.js	
+++ b/ui (gen4)/features/exif.js	
@@ -73,6 +73,7 @@ var EXIFActions = actions.Actions({
 	// XXX take image exif and write it to target...
 	setExif: ['- Image/Set exif data',
 		function(image, target){
+			// XXX
 		}]
 })
 
@@ -111,7 +112,34 @@ module.EXIF = core.ImageGridFeatures.Feature({
 //
 // 		...need to think about this...
 
+// XXX this should basically be platform independent...
+var EXIFUIActions = actions.Actions({
+	showExif: ['Image/Show exif',
+		function(image, force){
+			image = this.data.getImage(image)
+			var exif = !force 
+				&& this.images[image].metadata 
+				|| this.getExif(image, force)
+
+			// XXX
+		}]
+})
+
 // XXX
+var EXIFUI = 
+module.EXIFUI = core.ImageGridFeatures.Feature({
+	title: '',
+	doc: '',
+
+	tag: 'ui-exif',
+	depends: [
+		'ui',
+		'exif',
+	],
+
+	actions: EXIFUIActions,
+})
+
 
 
 /**********************************************************************
diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js
index e65f71fa..95815216 100755
--- a/ui (gen4)/features/filesystem.js	
+++ b/ui (gen4)/features/filesystem.js	
@@ -29,7 +29,7 @@ var core = require('features/core')
 
 var overlay = require('lib/widget/overlay')
 var browse = require('lib/widget/browse')
-var browseWalk = requirejs('lib/widget/browse-walk')
+var browseWalk = require('lib/widget/browse-walk')
 
 
 
diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js
index 47181a25..f082ead0 100755
--- a/ui (gen4)/lib/widget/browse.js	
+++ b/ui (gen4)/lib/widget/browse.js	
@@ -766,6 +766,7 @@ var BrowserPrototype = {
 				return $()
 			}
 
+			// build list item...
 			var res = $('<div>')
 				// handle clicks ONLY when not disabled...
 				.click(function(){
@@ -774,8 +775,8 @@ var BrowserPrototype = {
 						that.push($(this).find('.text').text())
 					}
 				})
-				//.text(p)
-				.append($('<div>')
+				// XXX add support for multiple .test blocks...
+				.append($('<span>')
 					.addClass('text')
 					.text(p))
 
@@ -1145,9 +1146,15 @@ var BrowserPrototype = {
 				// NOTE: this will mess up (clear) any highlighting that was 
 				// 		present before...
 				.each(function(_, e){
-					e = $(e).find('.text')
-					var t = e.text()
-					e.html(t.replace(p, '<b>$1</b>'))
+					e = $(e)
+						.find('.text')
+						// NOTE: here we support multiple text elements per
+						// 		list element...
+						.each(function(i, e){
+							e = $(e)
+							var t = e.text()
+							e.html(t.replace(p, '<b>$1</b>'))
+						})
 				})
 		}
 
diff --git a/ui (gen4)/lib/widget/widget.js b/ui (gen4)/lib/widget/widget.js
index c5d9c445..76c662d3 100755
--- a/ui (gen4)/lib/widget/widget.js	
+++ b/ui (gen4)/lib/widget/widget.js	
@@ -13,6 +13,7 @@ var object = require('../object')
 
 
 
+
 /*********************************************************************/
 // helpers...