diff --git a/ui/Makefile b/ui/Makefile index 7702e641..971bfa44 100755 --- a/ui/Makefile +++ b/ui/Makefile @@ -1,13 +1,24 @@ # TODO: add minification... (???) -# rule for processing LESS files to CSS... +# process LESS files to CSS... %.css: %.less lessc $< > $@ +# minify js... +%.min.js: %.js + uglifyjs $< -c -o $@ + + + # get all the .less files to process... CSS_FILES := $(patsubst %.less,%.css,$(wildcard *.less)) +JS_FILES := $(patsubst %.js,%.min.js,$(wildcard *.js)) + + +minify: $(JS_FILES) + all: $(CSS_FILES) clean: diff --git a/ui/keybindings.js b/ui/keybindings.js index 4949db42..eb83efdc 100755 --- a/ui/keybindings.js +++ b/ui/keybindings.js @@ -47,7 +47,7 @@ var KEYBOARD_CONFIG = { '.overlay-info:hover': { title: 'Info overlay', doc: 'Displayed on bottom of the screen if enabled (toggle with '+ - 'I) and/or inline, at bottom of and image when cursor '+ + 'I) and/or inline, at bottom of an image when cursor '+ 'is over it (only in ribbon mode, toggle with alt-I)'+ '
NOTE: when the cursor is over the info overlay one can use '+ @@ -77,7 +77,7 @@ var KEYBOARD_CONFIG = { '.drawer-mode': { title: 'Drawer modes', doc: 'NOTE: In this mode all other key bindings are disabled, '+ - 'except the ones explicitly defined here.', + 'except app defaults and the ones explicitly defined here.', ignore: '*', @@ -222,10 +222,10 @@ var KEYBOARD_CONFIG = { title: 'Global', doc: 'These key bindings work in most other modes.'+ - '
NOTE: shifting markid images from different ribbons will '+ + '
NOTE: shifting all marked images from different ribbons will '+ 'perform the operations on ALL marked images but relative '+ - 'the the current ribbon. i.e. some images might get promoted,'+ - 'others demoted while some will not change position.', + 'the the current ribbon. i.e. some images might get promoted, '+ + 'others demoted while some will not change position. ', // Basics... // XXX STUB: use a real path browser...