mirror of
https://github.com/tests-always-included/mo.git
synced 2024-12-18 16:27:52 +00:00
Removing unneeded parameter
This commit is contained in:
parent
5aa22680f5
commit
dc33657284
26
mo
26
mo
@ -36,7 +36,7 @@ mustache-loop() {
|
|||||||
|
|
||||||
while [[ "${#@}" -gt 0 ]]; do
|
while [[ "${#@}" -gt 0 ]]; do
|
||||||
mustache-full-tag-name CONTEXT "$CONTEXT_BASE" "$1"
|
mustache-full-tag-name CONTEXT "$CONTEXT_BASE" "$1"
|
||||||
mustache-parse IGNORE "$CONTENT" "" "$CONTEXT" false
|
mustache-parse IGNORE "$CONTENT" "$CONTEXT" false
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -135,17 +135,15 @@ mustache-find-end-tag() {
|
|||||||
# Parameters:
|
# Parameters:
|
||||||
# $1: Where to store content left after parsing
|
# $1: Where to store content left after parsing
|
||||||
# $2: Block of text to change
|
# $2: Block of text to change
|
||||||
# $3: Stop at this closing tag (eg "/NAME")
|
# $3: Current name (the variable NAME for what {{.}} means)
|
||||||
# $4: Current name (the variable NAME for what {{.}} means)
|
# $4: true when no content before this, false otherwise
|
||||||
# $5: true when no content before this, false otherwise
|
|
||||||
mustache-parse() {
|
mustache-parse() {
|
||||||
# Keep naming variables MUSTACHE_* here to not overwrite needed variables
|
# Keep naming variables MUSTACHE_* here to not overwrite needed variables
|
||||||
# used in the string replacements
|
# used in the string replacements
|
||||||
local MUSTACHE_BLOCK MUSTACHE_CONTENT MUSTACHE_CURRENT MUSTACHE_END_TAG MUSTACHE_IS_BEGINNING MUSTACHE_TAG
|
local MUSTACHE_BLOCK MUSTACHE_CONTENT MUSTACHE_CURRENT MUSTACHE_IS_BEGINNING MUSTACHE_TAG
|
||||||
|
|
||||||
MUSTACHE_END_TAG=$3
|
MUSTACHE_CURRENT=$3
|
||||||
MUSTACHE_CURRENT=$4
|
MUSTACHE_IS_BEGINNING=$4
|
||||||
MUSTACHE_IS_BEGINNING=$5
|
|
||||||
|
|
||||||
# Find open tags
|
# Find open tags
|
||||||
mustache-split MUSTACHE_CONTENT "$2" '{{' '}}'
|
mustache-split MUSTACHE_CONTENT "$2" '{{' '}}'
|
||||||
@ -166,12 +164,12 @@ mustache-parse() {
|
|||||||
# Show / loop / pass through function
|
# Show / loop / pass through function
|
||||||
if mustache-is-function "$MUSTACHE_TAG"; then
|
if mustache-is-function "$MUSTACHE_TAG"; then
|
||||||
MUSTACHE_CONTENT=$($MUSTACHE_TAG "${MUSTACHE_BLOCK[0]}")
|
MUSTACHE_CONTENT=$($MUSTACHE_TAG "${MUSTACHE_BLOCK[0]}")
|
||||||
mustache-parse MUSTACHE_CONTENT "$MUSTACHE_CONTENT" "" "$MUSTACHE_CURRENT" false
|
mustache-parse MUSTACHE_CONTENT "$MUSTACHE_CONTENT" "$MUSTACHE_CURRENT" false
|
||||||
MUSTACHE_CONTENT="${MUSTACHE_BLOCK[2]}"
|
MUSTACHE_CONTENT="${MUSTACHE_BLOCK[2]}"
|
||||||
elif mustache-is-array "$MUSTACHE_TAG"; then
|
elif mustache-is-array "$MUSTACHE_TAG"; then
|
||||||
eval 'mustache-loop "${MUSTACHE_BLOCK[0]}" "$MUSTACHE_TAG" "${!'"$MUSTACHE_TAG"'[@]}"'
|
eval 'mustache-loop "${MUSTACHE_BLOCK[0]}" "$MUSTACHE_TAG" "${!'"$MUSTACHE_TAG"'[@]}"'
|
||||||
else
|
else
|
||||||
mustache-parse MUSTACHE_CONTENT "${MUSTACHE_BLOCK[0]}" "" "$MUSTACHE_CURRENT" false
|
mustache-parse MUSTACHE_CONTENT "${MUSTACHE_BLOCK[0]}" "$MUSTACHE_CURRENT" false
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -190,7 +188,7 @@ mustache-parse() {
|
|||||||
# TODO: Remove dirname and use a function instead
|
# TODO: Remove dirname and use a function instead
|
||||||
cd "$(dirname "$MUSTACHE_TAG")"
|
cd "$(dirname "$MUSTACHE_TAG")"
|
||||||
mustache-load-file MUSTACHE_TAG "${MUSTACHE_TAG##*/}"
|
mustache-load-file MUSTACHE_TAG "${MUSTACHE_TAG##*/}"
|
||||||
mustache-parse MUSTACHE_TAG "$MUSTACHE_TAG" "" "$MUSTACHE_CURRENT" true
|
mustache-parse MUSTACHE_TAG "$MUSTACHE_TAG" "$MUSTACHE_CURRENT" true
|
||||||
echo -n $MUSTACHE_TAG
|
echo -n $MUSTACHE_TAG
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
@ -209,7 +207,7 @@ mustache-parse() {
|
|||||||
mustache-full-tag-name MUSTACHE_TAG "$MUSTACHE_CURRENT" "$MUSTACHE_TAG"
|
mustache-full-tag-name MUSTACHE_TAG "$MUSTACHE_CURRENT" "$MUSTACHE_TAG"
|
||||||
|
|
||||||
if ! mustache-test "$MUSTACHE_TAG"; then
|
if ! mustache-test "$MUSTACHE_TAG"; then
|
||||||
mustache-parse MUSTACHE_CONTENT "${MUSTACHE_BLOCK[0]}" "" "$MUSTACHE_CURRENT" false
|
mustache-parse MUSTACHE_CONTENT "${MUSTACHE_BLOCK[0]}" "$MUSTACHE_CURRENT" false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MUSTACHE_CONTENT="${MUSTACHE_BLOCK[2]}"
|
MUSTACHE_CONTENT="${MUSTACHE_BLOCK[2]}"
|
||||||
@ -366,7 +364,7 @@ mustache-show() {
|
|||||||
|
|
||||||
if mustache-is-function "$1"; then
|
if mustache-is-function "$1"; then
|
||||||
CONTENT=$($1 "")
|
CONTENT=$($1 "")
|
||||||
mustache-parse CONTENT "$CONTENT" "" "$2" false
|
mustache-parse CONTENT "$CONTENT" "$2" false
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -591,4 +589,4 @@ mustache-load-file() {
|
|||||||
MUSTACHE_FUNCTIONS=$(declare -F)
|
MUSTACHE_FUNCTIONS=$(declare -F)
|
||||||
MUSTACHE_FUNCTIONS=( ${MUSTACHE_FUNCTIONS//declare -f /} )
|
MUSTACHE_FUNCTIONS=( ${MUSTACHE_FUNCTIONS//declare -f /} )
|
||||||
mustache-get-content MUSTACHE_CONTENT ${1+"$@"}
|
mustache-get-content MUSTACHE_CONTENT ${1+"$@"}
|
||||||
mustache-parse MUSTACHE_CONTENT "$MUSTACHE_CONTENT" "" "" true
|
mustache-parse MUSTACHE_CONTENT "$MUSTACHE_CONTENT" "" true
|
||||||
|
Loading…
Reference in New Issue
Block a user