From aa4f0be9140f82fc025cee711a22fd86ce6ee7f6 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 20 Jul 2014 03:00:24 +0400 Subject: [PATCH] updated makefile and some tweaks... Signed-off-by: Alex A. Naanou --- ui (gen4)/Makefile | 10 ++++++---- ui (gen4)/index.html | 4 ++++ ui (gen4)/ribbons.js | 10 ++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index 0dd053ed..bb1efb1f 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -25,7 +25,9 @@ APP_NAME=ImageGrid.Viewer #********************************************************************** # get all the .less files to process... -CSS_FILES := $(patsubst %.less,%.css,$(wildcard *.less)) +#LESS_FILES := $(shell find . -type f -name '*.less') +#CSS_FILES := $(patsubst %.less,%.css,$(LESS_FILES)) +CSS_FILES := $(patsubst %.less,%.css,$(wildcard css/*.less)) LIB_DIR=lib EXT_LIB_DIR=ext-lib @@ -114,9 +116,9 @@ node-deps: # npm install exif dev: $(CSS_FILES) - unzip -uj $(wildcard targets/node-webkit/node-webkit-*-win-ia32.zip) -d . - rm -f nwsnapshot.exe credits.html - chmod +x *.{exe,dll} + #unzip -uj $(wildcard targets/node-webkit/node-webkit-*-win-ia32.zip) -d . + #rm -f nwsnapshot.exe credits.html + #chmod +x *.{exe,dll} #dev-targets: # mkdir -p targets/node-webkit diff --git a/ui (gen4)/index.html b/ui (gen4)/index.html index 12cfcea1..e8240a4f 100755 --- a/ui (gen4)/index.html +++ b/ui (gen4)/index.html @@ -2,6 +2,10 @@ + + + + diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js index 7ee30253..1d7a3ee8 100755 --- a/ui (gen4)/ribbons.js +++ b/ui (gen4)/ribbons.js @@ -143,6 +143,8 @@ var RibbonsPrototype = { return updateImage(image) }, + // XXX do we need shorthands like shiftImageUp/shiftImageDown/... here? + // XXX this does not align anything, it's just a low level focus... // XXX interaction animation... focusImage: function(gid){ @@ -240,10 +242,10 @@ var RibbonsPrototype = { // shorthands... // XXX should these be here??? - rotateCW: function(target){ return this.rotateImage(target, this.CW) }, - rotateCCW: function(target){ return this.rotateImage(target, this.CCW) }, - flipVertical: function(target){ return this.flipImage(target, this.VERTICAL) }, - flipHorizontal: function(target){ return this.flipImage(target, this.HORIZONTAL) }, + //rotateCW: function(target){ return this.rotateImage(target, this.CW) }, + //rotateCCW: function(target){ return this.rotateImage(target, this.CCW) }, + //flipVertical: function(target){ return this.flipImage(target, this.VERTICAL) }, + //flipHorizontal: function(target){ return this.flipImage(target, this.HORIZONTAL) }, // Bulk manipulation...