Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
35875acd
Commit
35875acd
authored
Jan 20, 2011
by
John Resig
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'make_fix' of
https://github.com/danheberden/jquery
into danheberden-make_fix
parents
3dbd600e
74dfc7f2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Makefile
Makefile
+4
-1
uglify.js
build/uglify.js
+2
-2
No files found.
Makefile
View file @
35875acd
...
@@ -96,7 +96,10 @@ min: ${JQ_MIN}
...
@@ -96,7 +96,10 @@ min: ${JQ_MIN}
${JQ_MIN}
:
${JQ}
${JQ_MIN}
:
${JQ}
@
@echo
"Building"
${
JQ_MIN
}
@
@echo
"Building"
${
JQ_MIN
}
@
@
${
COMPILER
}
${
JQ
}
>
${
JQ_MIN
}
@
@
${
COMPILER
}
${
JQ
}
>
${
JQ_MIN
}
.tmp
@
@echo
";"
>>
${
JQ_MIN
}
.tmp
@
@sed
's/\*\/(/*\/ʩ(/'
${
JQ_MIN
}
.tmp |
tr
"ʩ"
"
\n
"
>
${
JQ_MIN
}
@
@rm
-rf
${
JQ_MIN
}
.tmp
clean
:
clean
:
@
@echo
"Removing Distribution directory:"
${
DIST_DIR
}
@
@echo
"Removing Distribution directory:"
${
DIST_DIR
}
...
...
build/uglify.js
View file @
35875acd
...
@@ -143,7 +143,7 @@ function show_copyright(comments) {
...
@@ -143,7 +143,7 @@ function show_copyright(comments) {
if
(
c
.
type
==
"comment1"
)
{
if
(
c
.
type
==
"comment1"
)
{
ret
+=
"//"
+
c
.
value
+
"
\n
"
;
ret
+=
"//"
+
c
.
value
+
"
\n
"
;
}
else
{
}
else
{
ret
+=
"/*"
+
c
.
value
+
"*/
\n
"
;
ret
+=
"/*"
+
c
.
value
+
"*/"
;
}
}
}
}
return
ret
;
return
ret
;
...
@@ -181,7 +181,7 @@ function squeeze_it(code) {
...
@@ -181,7 +181,7 @@ function squeeze_it(code) {
});
});
if
(
options
.
ast
)
if
(
options
.
ast
)
return
sys
.
inspect
(
ast
,
null
,
null
);
return
sys
.
inspect
(
ast
,
null
,
null
);
result
+=
time_it
(
"generate"
,
function
(){
return
pro
.
gen_code
(
ast
,
options
.
beautify
&&
options
.
beautify_options
)
})
+
";"
;
result
+=
time_it
(
"generate"
,
function
(){
return
pro
.
gen_code
(
ast
,
options
.
beautify
&&
options
.
beautify_options
)
});
return
result
;
return
result
;
}
catch
(
ex
)
{
}
catch
(
ex
)
{
sys
.
debug
(
ex
.
stack
);
sys
.
debug
(
ex
.
stack
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment