projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
007617c
)
Fix jQuery fix, $ gets clobbered by make even in single quotes.
author
Jason Skomorowski
<jason@indexdata.com>
Tue, 24 Jun 2014 16:10:36 +0000
(12:10 -0400)
committer
Jason Skomorowski
<jason@indexdata.com>
Tue, 24 Jun 2014 16:10:36 +0000
(12:10 -0400)
src/Makefile
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index
86ebb77
..
bc7ef19
100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-46,7
+46,7
@@
mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J
echo "*/"; \
cat ${JQUERY_FILE}; \
cat ${JQUERY_JSON_FILE}; \
- echo 'mkws_jQuery = $.noConflict();'; \
+ echo 'mkws_jQuery = jQuery.noConflict(true);'; \
cat ${HANDLEBARS_FILE}; \
cat ${PP2_FILE}; \
cat mkws.js; \