VimPlug/emmet-vim-fork
1
0
Fork 0
forked from VimPlug/emmet-vim
Code Pull Requests Activity

Fixes #133

Browse Source
This commit is contained in:
joe di castro
2013-08-07 18:57:19 +02:00
parent 455f6f5760
commit 7fb711c257
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/emmet/lang/haml.vim
View File

@@ -120,7 +120,10 @@ function! emmet#lang#haml#imageSize()
if fn =~ '^\s*$'
return
elseif fn !~ '^\(/\|http\)'
let fn = simplify(expand('%:h') . '/' . fn)
let fn = resolve(expand(fn))
if !filereadable(fn)
let fn = simplify(expand('%:h') . '/' . fn)
endif
endif
let [width, height] = emmet#util#getImageSize(fn)

5
autoload/emmet/lang/html.vim
View File

@@ -444,7 +444,10 @@ function! emmet#lang#html#imageSize()
if fn =~ '^\s*$'
return
elseif fn !~ '^\(/\|http\)'
let fn = simplify(expand('%:h') . '/' . fn)
let fn = resolve(expand(fn))
if !filereadable(fn)
let fn = simplify(expand('%:h') . '/' . fn)
endif
endif
let [width, height] = emmet#util#getImageSize(fn)

5
autoload/emmet/lang/slim.vim
View File

@@ -98,7 +98,10 @@ function! emmet#lang#slim#imageSize()
if fn =~ '^\s*$'
return
elseif fn !~ '^\(/\|http\)'
let fn = simplify(expand('%:h') . '/' . fn)
let fn = resolve(expand(fn))
if !filereadable(fn)
let fn = simplify(expand('%:h') . '/' . fn)
endif
endif
let [width, height] = emmet#util#getImageSize(fn)

15
autoload/emmet/util.vim
View File

@@ -241,11 +241,16 @@ function! emmet#util#getImageSize(fn)
endfunction
function! emmet#util#imageSizeWithImageMagick(fn)
let img_info = system('identify -format "%wx%h" "'.a:fn.'"')
let img_size = split(substitute(img_info, '\n', '', ''), 'x')
let width = img_size[0]
let height = img_size[1]
return [width, height]
let fn = a:fn
if filereadable(fn)
let img_info = system('identify -format "%wx%h" "'.a:fn.'"')
let img_size = split(substitute(img_info, '\n', '', ''), 'x')
let width = img_size[0]
let height = img_size[1]
return [width, height]
else
echo 'The file "'.fn.'" does not exist or is not readable'
return [-1, -1]
endfunction
function! emmet#util#isImageMagickInstalled()