mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-28 18:00:09 +00:00
moved the browser widget out of experiments...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
e3dd1d523c
commit
baf7cd6a15
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<link rel="stylesheet" href="browse-dialog.css">
|
||||
<link rel="stylesheet" href="../../css/widget/browse.css">
|
||||
<style>
|
||||
|
||||
/* scrollbar setup... */
|
||||
@ -96,13 +96,13 @@ body.dark {
|
||||
|
||||
</style>
|
||||
|
||||
<script src="../ext-lib/jquery.js"></script>
|
||||
<script src="../ext-lib/jquery-ui.js"></script>
|
||||
<script src="../../ext-lib/jquery.js"></script>
|
||||
<script src="../../ext-lib/jquery-ui.js"></script>
|
||||
|
||||
<script src="../lib/jli.js"></script>
|
||||
<script src="../lib/toggler.js"></script>
|
||||
<script src="../jli.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-->
|
||||
@ -155,7 +155,7 @@ TREE.dir_c.dir_b.tree = TREE
|
||||
var use_disabled = true
|
||||
var show_files = false
|
||||
|
||||
requirejs(['../lib/keyboard', '../object', './browse-dialog'], function(k, o, br){
|
||||
requirejs(['../keyboard', '../../object', './browse'], function(k, o, br){
|
||||
keyboard = k
|
||||
object = o
|
||||
browser = br
|
||||
@ -279,7 +279,7 @@ requirejs(['../lib/keyboard', '../object', './browse-dialog'], function(k, o, br
|
||||
// matches...
|
||||
// NOTE: this will make more sence when path patterns are
|
||||
// supported...
|
||||
'dynamic/1/1/*': function(path, make){
|
||||
'dynamic/1/*/*': function(path, make){
|
||||
make('mooo!/')
|
||||
make('fooo!')
|
||||
},
|
||||
@ -18,7 +18,8 @@ if(typeof(module) !== 'undefined' && module.exports){
|
||||
define(function(require){ var module = {}
|
||||
|
||||
|
||||
var object = require('../object')
|
||||
// XXX
|
||||
var object = require('../../object')
|
||||
|
||||
|
||||
|
||||
@ -1731,12 +1732,15 @@ PathListPrototype.options = {
|
||||
var lister = keys
|
||||
.filter(function(k){ return k.trim().slice(-1) == '*' })
|
||||
.filter(function(k){
|
||||
return k
|
||||
.split(/[\\\/]+/)
|
||||
// remove the '*'...
|
||||
k = k.split(/[\\\/]+/)
|
||||
// remove the trailing '*'...
|
||||
.slice(0, -1)
|
||||
// do the match...
|
||||
.filter(function(e, i){ return e != path[i] }).length == 0 })
|
||||
|
||||
// do the match...
|
||||
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})
|
||||
.pop()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user