ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not extend goog.* types

Browse Source
This commit is contained in:
Andreas Hocevar
2014-08-27 17:29:17 +02:00
parent 80ea1772e2
commit a0c76aa5ee
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasks/generate-externs.js
+4 -2
View File
@@ -7,6 +7,8 @@ var nomnom = require('nomnom');
var generateInfo = require('./generate-info'); var generateInfo = require('./generate-info');
var googRegEx = /^goog\..*$/;
/** /**
* Read the symbols from info file. * Read the symbols from info file.
* @param {funciton(Error, Array.<string>, Array.<Object>)} callback Called * @param {funciton(Error, Array.<string>, Array.<Object>)} callback Called
@@ -67,7 +69,7 @@ function generateExterns(typedefs, symbols, externs, interfaces) {
function noGoogTypes(typesWithGoog) { function noGoogTypes(typesWithGoog) {
var typesWithoutGoog = []; var typesWithoutGoog = [];
typesWithGoog.forEach(function(type) { typesWithGoog.forEach(function(type) {
typesWithoutGoog.push(type.replace(/^goog\..*$/, '*')); typesWithoutGoog.push(type.replace(googRegEx, '*'));
}); });
return typesWithoutGoog; return typesWithoutGoog;
} }
@@ -93,7 +95,7 @@ function generateExterns(typedefs, symbols, externs, interfaces) {
if (symbol.kind === 'class') { if (symbol.kind === 'class') {
constructors[name] = true; constructors[name] = true;
lines.push(' * @constructor'); lines.push(' * @constructor');
if (symbol.extends) { if (symbol.extends && !googRegEx.test(symbol.extends)) {
lines.push(' * @extends {' + symbol.extends + '}'); lines.push(' * @extends {' + symbol.extends + '}');
} }
} }