Skip to content
Permalink
Browse files

Merge pull request #21 from enyojs/chrome-store-support

Chrome store support
  • Loading branch information...
unwiredben committed Jul 29, 2013
2 parents a798d69 + 43d0bcd commit 07de25d5bd9791dc06b3b87f01a53183e5063a3e
Showing with 25 additions and 12 deletions.
  1. +1 −0 .jshintrc
  2. +1 −0 assets/{manifest.json → api-manifest.json}
  3. +1 −1 enyo
  4. +1 −1 lib/extra
  5. +1 −1 lib/layout
  6. +1 −1 source/PackageList.js
  7. +19 −8 source/Presentor.js
@@ -3,6 +3,7 @@
"enyo": false,
"analyzer": true
},
"es3": true,
"evil": false,
"regexdash": true,
"browser": true,
@@ -2,6 +2,7 @@
"version": "2.3.0",
"packages": [
{"name": "enyo", "path": "enyo/source"},
{"name": "layout/contextual", "path": "lib/layout/contextual"},
{"name": "layout/easing", "path": "lib/layout/easing"},
{"name": "layout/fittable", "path": "lib/layout/fittable"},
{"name": "layout/imageview", "path": "lib/layout/imageview"},
2 enyo
Submodule enyo updated from ceee56 to 8745e9
Submodule extra updated from 3cebd2 to f4b438
Submodule layout updated from 85b628 to 75279c
@@ -29,7 +29,7 @@ enyo.kind({
this.$.version.setContent("Content Version: " + this.version);
},
fetchPackageData: function() {
new enyo.Ajax({url: "assets/manifest.json", mimeType: "application/json"})
new enyo.Ajax({url: "assets/api-manifest.json", mimeType: "application/json"})
.response(this, function(inSender, inData) {
this.setVersion(inData.version);
this.gotPackageData(inData.packages);
@@ -18,6 +18,7 @@ enyo.kind({
case "module":
return this.presentObjects(inObject.objects);
case "kind":
case "singleton":
return this.presentKind(inObject);
case "function":
case "global":
@@ -43,6 +44,19 @@ enyo.kind({
publicMethods = true;
}
//
objs = this.getByType(o$, "singleton");
if (objs.length) {
html += "<h3>Singletons</h3>";
for (i=0; (o=objs[i]); i++) {
//w("<i>name:</i> ");
html += "<kind>" + o.name + "</kind><br/>";
html += this.presentComment(o.comment);
//html += "<blockquote>" + this.presentKind(o) + "</blockquote>";
//html += this.presentKind(o);
}
publicMethods = true;
}
//
objs = this.getByType(o$, "function");
if (objs.length) {
html += "<h3>Functions</h3>";
@@ -103,11 +117,7 @@ enyo.kind({
+ '</a>'
+ '</superkind>';
*/
html +=
' :: <a href=#' + e + '>'
+ e
+ '</a>'
;
html += ' :: <a href=#' + e + '>' + e + '</a>';
});
html += '</div>';
}
@@ -117,9 +127,7 @@ enyo.kind({
var html = '';
if (inKind.comment) {
html +=
'<h3>Summary</h3>'
+ this.presentComment(inKind.comment)
;
'<h3>Summary</h3>' + this.presentComment(inKind.comment);
}
return html;
},
@@ -233,6 +241,9 @@ enyo.kind({
html = html.replace(/<pre><code>([\s\S]*?)<\/code><\/pre>/gm, function(m, c) {
return "<pre>" + syntaxHighlight(c) + "</pre>";
});
// change external links to use target _blank for Chrome app support
html = html.replace(/<a href="http/gm, "<a target=\"_blank\" href=\"http");
html = html.replace(/<a href='http/gm, "<a target=\"_blank\" href=\'http");
return html;
},
// returns a new list where the properties of objects mentioned as

0 comments on commit 07de25d

Please sign in to comment.
You can’t perform that action at this time.