Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
e3ea413a
Unverified
Commit
e3ea413a
authored
Jun 20, 2018
by
Adam Cozzette
Committed by
GitHub
Jun 20, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4780 from mwei0210/master
check provided size to check whether to export
parents
761a6275
6074aaa9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
js_generator.cc
src/google/protobuf/compiler/js/js_generator.cc
+2
-1
No files found.
src/google/protobuf/compiler/js/js_generator.cc
View file @
e3ea413a
...
...
@@ -3477,7 +3477,8 @@ void Generator::GenerateFile(const GeneratorOptions& options,
GenerateExtension
(
options
,
printer
,
*
it
);
}
if
(
options
.
import_style
==
GeneratorOptions
::
kImportCommonJs
)
{
// if provided is empty, do not export anything
if
(
options
.
import_style
==
GeneratorOptions
::
kImportCommonJs
&&
!
provided
.
empty
())
{
printer
->
Print
(
"goog.object.extend(exports, $package$);
\n
"
,
"package"
,
GetFilePath
(
options
,
file
));
}
...
...
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