flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved the browser widget out of experiments...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2015-09-05 02:52:51 +03:00
parent e3dd1d523c
commit baf7cd6a15
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ui (gen4)/experiments/browse-dialog.css → ui (gen4)/css/widget/browse.css
View File

16
ui (gen4)/experiments/browse-dialog.html → ui (gen4)/lib/widget/browse.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<link rel="stylesheet" href="browse-dialog.css"> <link rel="stylesheet" href="../../css/widget/browse.css">
<style> <style>
/* scrollbar setup... */ /* scrollbar setup... */
@ -96,13 +96,13 @@ body.dark {
</style> </style>
<script src="../ext-lib/jquery.js"></script> <script src="../../ext-lib/jquery.js"></script>
<script src="../ext-lib/jquery-ui.js"></script> <script src="../../ext-lib/jquery-ui.js"></script>
<script src="../lib/jli.js"></script> <script src="../jli.js"></script>
<script src="../lib/toggler.js"></script> <script src="../toggler.js"></script>
<script src="../ext-lib/require.js"></script> <script src="../../ext-lib/require.js"></script>
<!--script src="browse-dialog.js"></script--> <!--script src="browse-dialog.js"></script-->
@ -155,7 +155,7 @@ 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, br){ requirejs(['../keyboard', '../../object', './browse'], function(k, o, br){
keyboard = k keyboard = k
object = o object = o
browser = br browser = br
@ -279,7 +279,7 @@ requirejs(['../lib/keyboard', '../object', './browse-dialog'], function(k, o, br
// matches... // matches...
// NOTE: this will make more sence when path patterns are // NOTE: this will make more sence when path patterns are
// supported... // supported...
'dynamic/1/1/*': function(path, make){ 'dynamic/1/*/*': function(path, make){
make('mooo!/') make('mooo!/')
make('fooo!') make('fooo!')
}, },

14
ui (gen4)/experiments/browse-dialog.js → ui (gen4)/lib/widget/browse.js
View File

@ -18,7 +18,8 @@ if(typeof(module) !== 'undefined' && module.exports){
define(function(require){ var module = {} define(function(require){ var module = {}
var object = require('../object') // XXX
var object = require('../../object')
@ -1731,12 +1732,15 @@ PathListPrototype.options = {
var lister = keys var lister = keys
.filter(function(k){ return k.trim().slice(-1) == '*' }) .filter(function(k){ return k.trim().slice(-1) == '*' })
.filter(function(k){ .filter(function(k){
return k k = k.split(/[\\\/]+/)
.split(/[\\\/]+/) // remove the trailing '*'...
// remove the '*'...
.slice(0, -1) .slice(0, -1)
// do the match... // do the match...
.filter(function(e, i){ return e != path[i] }).length == 0 }) return k.length <= path.length
&& k.filter(function(e, i){
return e != '*' && e != path[i]
}).length == 0 })
.sort(function(a, b){ return a.length - b.length}) .sort(function(a, b){ return a.length - b.length})
.pop() .pop()