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

Merge pull request #2071 from tschaub/doc

Browse Source 
Minor doc content and style updates.
This commit is contained in:
Tim Schaub
2014-05-14 18:28:54 -06:00
parent f559963126 049531831c
commit 9874f502ab
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apidoc/template/static/styles/jaguar.css
View File

@@ -190,9 +190,9 @@ li {
border-radius: 3px;
background-color: #1F6B75 !important;
color: #fff;
font-size: 0.7em;
vertical-align: top;
font-size: 0.8em;
padding: 2px 4px;
margin-right: 8px;
}
.main span.number {
background-color: #ccc !important;
@@ -263,7 +263,8 @@ li {
display: inline-block;
border-radius: 3px;
background-color: #888!important;
font-size: 0.7em;
vertical-align: top;
font-size: 0.8em;
padding: 2px 4px;
margin-right: 5px;
}

4
apidoc/template/tmpl/container.tmpl
View File

@@ -13,9 +13,7 @@
<header>
<h2><?js if (doc.ancestors && doc.ancestors.length) { ?>
<span class="ancestors"><?js= doc.ancestors.join('') ?></span>
<?js } ?>
<?js= doc.name ?>
<span class="ancestors"><?js= doc.ancestors.join('') ?></span><?js } ?><?js= doc.name ?>
<?js if (doc.variation) { ?>
<sup class="variation"><?js= doc.variation ?></sup>
<?js } ?></h2>

7
apidoc/template/tmpl/members.tmpl
View File

@@ -11,10 +11,11 @@ if (data.type && data.type.names) {
?>
<dt>
<div class="nameContainer">
<h4 class="name" id="<?js= id ?>"><?js= this.partial('stability.tmpl', data) ?>
<?js= data.attribs + (data.scope === 'static' ? longname : name) + typeSignature ?></h4>
<h4 class="name" id="<?js= id ?>">
<?js= data.attribs + (data.scope === 'static' ? longname : name) + typeSignature ?>
<?js= this.partial('stability.tmpl', data) ?>
</h4>
</div>
<?js if (data.summary) { ?>
<p class="summary"><?js= summary ?></p>
<?js } ?>

13
apidoc/template/tmpl/method.tmpl
View File

@@ -5,13 +5,13 @@ var self = this;
<dt>
<div class="nameContainer<?js if (data.inherited) { ?> inherited<?js } ?>">
<?js if (data.stability || kind !== 'class') { ?>
<h4 class="name" id="<?js= id ?>"><?js= this.partial('stability.tmpl', data) ?>
<h4 class="name" id="<?js= id ?>">
<?js= data.attribs + (kind === 'class' ? 'new ' : '') + (data.scope === 'static' ? longname : name) + (kind !== 'event' ? data.signature : '') ?>
<?js if (data.inherited || data.inherits) { ?>
<span class="inherited"><?js= this.linkto(data.inherits, 'inherited') ?></span>
<?js } ?>
<?js= data.attribs + (kind === 'class' ? 'new ' : '') + (data.scope === 'static' ? longname : name) + (kind !== 'event' ? data.signature : '') ?>
<?js= this.partial('stability.tmpl', data) ?>
</h4>
<?js if (data.meta) {?>
<div class="tag-source">
<?js= self.linkto(meta.filename) ?>, <?js= self.linkto(meta.filename, 'line ' + meta.lineno, null, 'line' + meta.lineno) ?>
@@ -19,7 +19,6 @@ var self = this;
<?js } ?>
<?js } ?>
</div>
<?js if (data.summary) { ?>
<p class="summary"><?js= summary ?></p>
<?js } ?>
@@ -60,7 +59,6 @@ var self = this;
var parts = f.split(/#?event:/);
?>
<li><?js var eventDoclet = self.find({longname: f})[0]; ?>
<?js= (eventDoclet ? self.partial('stability.tmpl', eventDoclet) : '') ?>
<code><?js= self.linkto(f, parts[1]) ?></code>
<?js if (parts[0]) {
var eventClass = self.find({longname: parts[0]})[0];
@@ -68,8 +66,9 @@ var self = this;
(<?js= self.linkto(eventClass.longname) ?>)
<?js } ?>
<?js } ?>
<?js if (eventDoclet && eventDoclet.description) { ?>
- <?js= eventDoclet.description.replace(/<[^>]*>/g, '') ?>
<?js if (eventDoclet && eventDoclet.description) { ?> -
<?js= (eventDoclet ? self.partial('stability.tmpl', eventDoclet) : '') ?>
<?js= eventDoclet.description.replace(/<[^>]*>/g, '') ?>
<?js } ?>
</li>
<?js }); ?></ul>

2
src/ol/map.js
View File

@@ -144,7 +144,7 @@ ol.MapProperty = {
* }),
* layers: [
* new ol.layer.Tile({
* source: new ol.source.MapQuestOSM()
* source: new ol.source.MapQuest({layer: 'osm'})
* })
* ],
* target: 'map'