add sprite closing to main.go

wellington · Jan 2, 2016 · b1c447d · b1c447d
1 parent 45239a5
commit b1c447d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/build.go b/build.go
@@ -157,7 +157,7 @@ func (b *Build) build(path string) error {
 	}
 
 	if !isImportable(path) {
-		return errors.New("file is does not end in .sass or .scss")
+		return errors.New("file does not end in .sass or .scss")
 	}
 
 	out, bdir, err := b.bArgs.getOut(path)

diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -78,6 +78,7 @@ func ImageHeight(mainctx context.Context, usv libsass.SassValue) (*libsass.SassV
 		glob string
 		name string
 	)
+
 	comp, err := libsass.CompFromCtx(mainctx)
 	if err != nil {
 		return nil, err
@@ -116,7 +117,7 @@ func ImageHeight(mainctx context.Context, usv libsass.SassValue) (*libsass.SassV
 		return nil, errors.New("inline payload not available")
 	}
 
-	if glob == "" {
+	if len(glob) == 0 {
 		exst := images.Get(name)
 		if exst != nil {
 			imgs = exst

diff --git a/payload/payload.go b/payload/payload.go
@@ -35,5 +35,5 @@ func Sprite(ctx context.Context) Payloader {
 }
 
 func Image(ctx context.Context) Payloader {
-	return ctx.Value(spriteKey).(Payloader)
+	return ctx.Value(imageKey).(Payloader)
 }
diff --git a/scripts/swift.sh b/scripts/swift.sh
@@ -4,6 +4,6 @@ export rmnpath=$RMN_BASE_PATH
 export guipath=$rmnpath/www/gui
 
 FILES=$(find $rmnpath/www/gui/sass -name "[^_]*\.scss")
-echo wt compile --gen $guipath/build/im --font $guipath/font-face -b $guipath/build/css --images-dir $guipath/im/sass $guipath/sass
+echo wt compile -p $guipath/sass --gen $guipath/build/im --font $guipath/font-face -b $guipath/build/css --images-dir $guipath/im/sass $guipath/sass
 
-time wt compile --gen $guipath/build/im --font $guipath/font-face -b $guipath/build/css --images-dir $guipath/im/sass $guipath/sass
+time wt compile -p $guipath/sass --gen $guipath/build/im --font $guipath/font-face -b $guipath/build/css --images-dir $guipath/im/sass $guipath/sass
diff --git a/wt/main.go b/wt/main.go
@@ -417,7 +417,7 @@ func run(paths []string, pMap *wt.SafePartialMap, gba *wt.BuildArgs) {
 	// 	}
 	// }
 	sprites := payload.Sprite(gba.Payload)
-	sprites.ForEach(func(_ string, sprite *spritewell.Sprite) {
+	sprites.ForEach(func(k string, sprite *spritewell.Sprite) {
 		img.Add(1)
 		err := sprite.Wait()
 		img.Done()