flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2026-01-08 03:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

added list input (no callbacks) to List constructor + some cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2015-06-24 18:21:49 +03:00
parent 19dd2bedc5
commit 5f387eda31
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui (gen4)/experiments/browse-dialog.html
View File

@ -151,10 +151,10 @@ TREE.dir_c.dir_b.tree = TREE
var use_disabled = true var use_disabled = true
var show_files = false var show_files = false
requirejs(['../lib/keyboard', '../object', './browse-dialog'], function(k, o, b){ requirejs(['../lib/keyboard', '../object', './browse-dialog'], function(k, o, br){
keyboard = k keyboard = k
object = o object = o
browser = b browser = br
// Tree demo... // Tree demo...
b = browser.Browser($('.container.tree'), { b = browser.Browser($('.container.tree'), {

29
ui (gen4)/experiments/browse-dialog.js
View File

@ -227,6 +227,12 @@ var BrowserPrototype = {
// - build the element list // - build the element list
// - bind to control events // - bind to control events
// //
// For uniformity and ease of access from DOM, this will also set the
// 'path' html attribute on the .browse element.
// NOTE: this works one way, navigating to a different path will
// overwrite the attr but setting a new value to the html attr
// will not affect the actual path.
//
// XXX do we normalize path here??? // XXX do we normalize path here???
// XXX need a way to handle path errors in the extension API... // XXX need a way to handle path errors in the extension API...
// ...for example, if .list(..) can't list or lists a different // ...for example, if .list(..) can't list or lists a different
@ -329,6 +335,7 @@ var BrowserPrototype = {
res.forEach(make) res.forEach(make)
} }
this.dom.attr('path', '/' + this.path.join('/'))
this.trigger('update') this.trigger('update')
return this return this
@ -634,6 +641,12 @@ var BrowserPrototype = {
// //
// This will return a jQuery object. // This will return a jQuery object.
// //
// For uniformity and ease of access from DOM, this will also set
// the value attr on the .browse element.
// NOTE: this is one way and setting the html attribute "value" will
// not affect the selection, but changing the selection will
// overwrite the attribute.
//
// NOTE: if multiple matches occur this will select the first. // NOTE: if multiple matches occur this will select the first.
// NOTE: 'none' will always return an empty jQuery object, to get // NOTE: 'none' will always return an empty jQuery object, to get
// the selection state before deselecting use .select('!') // the selection state before deselecting use .select('!')
@ -737,6 +750,7 @@ var BrowserPrototype = {
} }
elem.addClass('selected') elem.addClass('selected')
browser.attr('value', elem.text())
this.trigger('select', elem) this.trigger('select', elem)
@ -932,6 +946,12 @@ object.makeConstructor('Browser',
// <option-text>: <callback>, // <option-text>: <callback>,
// ... // ...
// } // }
//
// or:
// [
// <option-text>,
// ...
// ]
// //
// NOTE: this essentially a different default configuration of Browser... // NOTE: this essentially a different default configuration of Browser...
var ListPrototype = Object.create(BrowserPrototype) var ListPrototype = Object.create(BrowserPrototype)
@ -942,12 +962,17 @@ ListPrototype.options = {
list: function(path, make){ list: function(path, make){
var that = this var that = this
return Object.keys(this.options.data) var data = this.options.data
var keys = data.constructor == Array ? data : Object.keys(data)
return keys
.map(function(k){ .map(function(k){
var e = make(k) var e = make(k)
.on('open', function(){
if(data !== keys){
e.on('open', function(){
return that.options.data[k].apply(this, arguments) return that.options.data[k].apply(this, arguments)
}) })
}
return k return k
}) })