Merge branch 'master' into Astro

2015-11-24 19:33:47 +08:00
parent bd966f2fac 3b898d0a63
commit 73301ce88a
5 changed files with 37 additions and 0 deletions
--- a/botanjs/src/externs/System.Global.js
+++ b/botanjs/src/externs/System.Global.js
@@ -6,3 +6,6 @@ System.Global.debug;

 /** @type {Boolean} */
 System.Global.IE;
+
+/** @type {Boolean} */
+System.Global.SECURE_HTTP;
--- a/botanjs/src/externs/System.utils.js
+++ b/botanjs/src/externs/System.utils.js
@@ -7,3 +7,5 @@ System.utils.objGetProp;
 System.utils.objSearch;
 /** @type {Function} */
 System.utils.objMap;
+/** @type {Function} */
+System.utils.siteProto;