Migrate old externs 4/x

botanjs/src/Astro/Blog/Components/Comment.js

@@ -327,9 +327,9 @@
 
 						Cycle.delay( function()
 						{
-							this.innerHTML = "Recaptcha failure";
-							this.style.height = "1.2em";
-						}.bind(f), 500 );
+							cBubble.setColor("red");
+							cBubble.pop("Recaptcha failure");
+						}, 500 );
 
 						Cycle.delay(function (){cBubble.blurp();}, 500);
 					}

botanjs/src/Astro/Blog/Components/Notification.js

@@ -32,7 +32,8 @@
 	var init = function ()
 	{
 		var stage = Dand.id( "notifications" );
-		var bodyStyle = Dand.id( "nt_body" ).style;
+		var nt_body = Dand.id( "nt_body" );
+		var bodyStyle = nt_body.style;
 
 		/** @type {_AstConf_.Notification} */
 		var conf = Config.get( "Notification" );

botanjs/src/Astro/Blog/Layout/MainFrame.js

@@ -125,9 +125,9 @@
 
 	var loadContactForm = function( e )
 	{
-		getData( "/ajax/get-snippet/ContactForm", function( data )
+		getData( "/ajax/get-snippet/ContactForm", function( rawdata )
 		{
-			var data = JSON.parse( data );
+			var data = JSON.parse( rawdata );
 			var wrapper = IDOMElement( contact_page ).first( 1 );
 			if ( wrapper )
 			{
@@ -345,21 +345,21 @@
 			return;
 		}
 		// far from observer
-		var slide_1 = { lowerLimit: 70, upperLimit: 100 }
+		var slide_1 = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 70, upperLimit: 100 })
 		// bottom cloud, concentrated
-		, slide_2a = { lowerLimit: 0, upperLimit: 200 }
-		, slide_2b = { lowerLimit: 0, upperLimit: 200 }
-		, slide_2c = { lowerLimit: 0, upperLimit: 200 }
+		, slide_2a = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 0, upperLimit: 200 })
+		, slide_2b = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 0, upperLimit: 200 })
+		, slide_2c = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 0, upperLimit: 200 })
 
-		, slide_3 = { lowerLimit: 20, upperLimit: 100 }
-		, slide_4 = { lowerLimit: 70, upperLimit: 100 }
+		, slide_3 = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 20, upperLimit: 100 })
+		, slide_4 = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 70, upperLimit: 100 })
 
-		, cloudRange_1 = { lowerLimit: 0, upperLimit: 100, leftLimit: -10, rightLimit: 110 }
-		, cloudRange_2a = { lowerLimit: 180, upperLimit: 200, leftLimit: -10, rightLimit: 110 }
-		, cloudRange_2b = { lowerLimit: 290, upperLimit: 300, leftLimit: -10, rightLimit: 110 }
-		, cloudRange_2c = { lowerLimit: 390, upperLimit: 400, leftLimit: -10, rightLimit: 110 }
-		, cloudRange_3 = { lowerLimit: 0, upperLimit: 300, leftLimit: -10, rightLimit: 110 }
-		, cloudRange_4 = { lowerLimit: 80, upperLimit: 100, leftLimit: -10, rightLimit: 110 }
+		, cloudRange_1 = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 0, upperLimit: 100, leftLimit: -10, rightLimit: 110 })
+		, cloudRange_2a = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 180, upperLimit: 200, leftLimit: -10, rightLimit: 110 })
+		, cloudRange_2b = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 290, upperLimit: 300, leftLimit: -10, rightLimit: 110 })
+		, cloudRange_2c = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 390, upperLimit: 400, leftLimit: -10, rightLimit: 110 })
+		, cloudRange_3 = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 0, upperLimit: 300, leftLimit: -10, rightLimit: 110 })
+		, cloudRange_4 = /** @type ({Dandelion.Bounds}) */ ({ lowerLimit: 80, upperLimit: 100, leftLimit: -10, rightLimit: 110 })
 
 		, cCloudSymbol = ["\u25CF", "\u25CF", "\u25CF", "\u25CB", "\u25CB"]
 		, cCloudSymbol2 = ["\u25CC" ]

botanjs/src/Astro/Mechanism/Parallax.js

@@ -62,7 +62,7 @@
 
 	var attach = function ( eDispatcher, sSupplier, opacityModifier )
 	{
-		var opacityModifier = ( opacityModifier == undefined ) ? 1 : opacityModifier + 0;
+		opacityModifier = ( opacityModifier == undefined ) ? 1 : opacityModifier + 0;
 		var s, l = Parallax.totalCSSSlide;
 
 		for( var i = 0; i < l; i ++ )

botanjs/src/Components/Console.js

@@ -7,7 +7,7 @@
 	var Perf                                = __import( "System.utils.Perf" );
 	/** @type {System.Cycle} */
 	var Cycle                               = __import( "System.Cycle" );
-	/** @type {System.Cycle.Tick} */
+	/** @type {System.Tick} */
 	var sTick                               = __import( "System.Cycle.TICK" );
 	/** @type {System.Global} */
 	var _global                             = __import( "System.Global" );
@@ -19,7 +19,7 @@
 	var Dand                                = __import( "Dandelion" );
 	/** @type {function(...?): Dandelion.IDOMElement} */
 	var IDOMElement                         = __import( "Dandelion.IDOMElement" );
-	/** @type {Components.DockPanel} */
+	/** @type {typeof Components.DockPanel} */
 	var DockPanel                           = __import( "Components.DockPanel" );
 
 	var objTreeView = function( obj, level, prepend )
@@ -66,7 +66,7 @@
 				}
 			}
 
-		, writeLine = function ( dat, type )
+		, writeLine = function ( dat )
 		{
 			var res_txt = response_txt;
 
@@ -115,7 +115,7 @@
 			)
 			, Dand.wrap( null, 'debugWrap', null, response_txt )
 			, "dtop"
-		);
+		).stage;
 
 		var istage = IDOMElement( stage );
 

botanjs/src/Components/DockPanel.js

@@ -47,7 +47,7 @@
 		w_div = Dand.wrap( null, w_id, 'fdock ' + align, w_div );
 
 		document.body.appendChild( w_div );
-		return w_div;
+		this.stage = w_div;
 	};
 
 	ns[ NS_EXPORT ]( EX_CLASS, "DockPanel", DockPanel );

botanjs/src/Libraries/SyntaxHighlighter/_this.js

@@ -874,9 +874,9 @@
 			getHtml: function(a) {
 				var b = "",
 					c = ["syntaxhighlighter"],
-					d;
+					d,gutter;
 				if (this.getParam("light") == true) this.params.toolbar = this.params["gutter"] = false;
-				className = "syntaxhighlighter";
+				var className = "syntaxhighlighter";
 				this.getParam("collapse") == true && c.push("collapsed");
 				if ((gutter = this.getParam("gutter")) == false) c.push("nogutter");
 				c.push(this.getParam("class-name"));

botanjs/src/System/Cycle/_this.js

@@ -74,6 +74,7 @@
 		a[ C_INTVL ] = interval;
 
 		tList[ tList.length ] = a;
+		return true;
 	};
 
 	var deletePermanentTicker = function ( id )

botanjs/src/System/Log.js

@@ -1,39 +1,62 @@
 (function(){
 	var ns = __namespace( "System.Log" );
+
+	/** @type {!Array<function(*, number): void>} */
 	var handler = [];
 
+	/** @const {number} */
 	var SYSTEM = 1;
+
+	/** @const {number} */
 	var INFO = 16;
+
+	/** @const {number} */
 	var ERROR = 32;
 
-	var writeLine = function ( mesg, type )
+	/**
+	 * @param {*} mesg
+	 * @param {number=} type
+	 * @return {void}
+	 */
+	var writeLine = function(mesg, type)
 	{
-		type = ( type === undefined ) ? INFO : type;
+		type = (type === undefined) ? INFO : type;
 
 		var handled = false;
-		for( var i in handler )
+
+		for (var i in handler)
 		{
-			handler[i]( mesg, type );
+			handler[i](mesg, type);
 			handled = true;
 		}
 
-		if( !handled
-			&& window[ "console" ]
+		if (!handled
+			&& window["console"]
 			&& console.log
-		) console.log( mesg );
+		) {
+			console.log(mesg);
+		}
 	};
 
-	var registerHandler = function( func )
+	/**
+	 * @param {function(*, number): void} func
+	 * @return {number}
+	 */
+	var registerHandler = function(func)
 	{
 		var index = -1;
-		handler[ index = handler.length ] = func;
+		handler[index = handler.length] = func;
 
 		return index;
 	};
 
-	var removeHandler = function( index )
+	/**
+	 * @param {number} index
+	 * @return {void}
+	 */
+	var removeHandler = function(index)
 	{
-		delete handler[ index ];
+		delete handler[index];
 	};
 
 	ns[ NS_EXPORT ]( EX_FUNC, "writeLine", writeLine );

botanjs/src/externs/Astro.Bootstrap.js

@@ -1,8 +1,8 @@
 /** @constructor */
 Astro.Bootstrap = function() {};
 
-/** @type {Function} */
-Astro.Bootstrap.init;
+/** @type {function(): void} */
+Astro.Bootstrap.prototype.init;
 
-/** @type {Function} */
-Astro.Bootstrap.regInit;
+/** @param {function(): void} callback */
+Astro.Bootstrap.prototype.regInit = function(callback) {};

botanjs/src/externs/Astro.Mechanism.Parallax.js

@@ -1,9 +1,19 @@
 /** @constructor */
 Astro.Mechanism.Parallax = function() {};
 
-/** @type {Function} */
-Astro.Mechanism.Parallax.cssSlide;
-/** @type {Function} */
-Astro.Mechanism.Parallax.verticalSlideTo;
-/** @type {Function} */
-Astro.Mechanism.Parallax.attach;
+/**
+ * @param {HTMLElement} el
+ * @param {number} index
+ * @param {Dandelion.Bounds} dist
+ */
+Astro.Mechanism.Parallax.prototype.cssSlide = function(el, index, dist) {};
+
+/** @param {number} index */
+Astro.Mechanism.Parallax.prototype.verticalSlideTo = function(index) {};
+
+/**
+ * @param {EventTarget} target
+ * @param {Dandelion.Window} wsupp
+ * @param {number} m_opacity
+ */
+Astro.Mechanism.Parallax.prototype.attach = function(target, wsupp, m_opacity) {};

botanjs/src/externs/Components.DockPanel.js

@@ -0,0 +1,10 @@
+/** @constructor
+ * @param {string} id
+ * @param {*} title
+ * @param {*} content
+ * @param {string} align
+ */
+Components.DockPanel = function(id, title, content, align) {};
+
+/** @type {HTMLElement} */
+Components.DockPanel.prototype.stage;

botanjs/src/externs/Dandelion.Window.js

@@ -0,0 +1,15 @@
+/** @constructor */
+Dandelion.Window = function() {};
+
+/** @type {number} */
+Dandelion.Window.prototype.scrollTop;
+/** @type {number} */
+Dandelion.Window.prototype.scrollLeft;
+/** @type {number} */
+Dandelion.Window.prototype.scrollWidth;
+/** @type {number} */
+Dandelion.Window.prototype.scrollHeight;
+/** @type {number} */
+Dandelion.Window.prototype.clientWidth;
+/** @type {number} */
+Dandelion.Window.prototype.clientHeight;

botanjs/src/externs/Dandelion.js

@@ -36,3 +36,13 @@ Dandelion.gname = function() {};
 
 /** @type {Function} */
 Dandelion.glass = function() {};
+
+/**
+ * @typedef {{
+ *   lowerLimit: (number|undefined),
+ *   upperLimit: (number|undefined),
+ *   leftLimit: (number|undefined),
+ *   rightLimit: (number|undefined)
+ * }}
+ */
+Dandelion.Bounds;

botanjs/src/externs/Libraries.SyntaxHighLighter.js

@@ -2,22 +2,22 @@
 Libraries.SyntaxHighlighter = function() {};
 
 /** @type {function(...?): ?} */
-Libraries.SyntaxHighlighter.all;
+Libraries.SyntaxHighlighter.prototype.all = function() {};
 
 /** @type {!Object<string, *>} */
-Libraries.SyntaxHighlighter.defaults;
+Libraries.SyntaxHighlighter.prototype.defaults;
 
 /** @type {function(...?): ?} */
-Libraries.SyntaxHighlighter.highlight;
+Libraries.SyntaxHighlighter.prototype.highlight = function(){};
 
 /** @type {!Object<string, *>} */
-Libraries.SyntaxHighlighter.Highlighter;
+Libraries.SyntaxHighlighter.prototype.Highlighter;
 
 /** @type {!Object<string, *>} */
-Libraries.SyntaxHighlighter.brushes;
+Libraries.SyntaxHighlighter.prototype.brushes;
 
 /** @type {!Object<string, !RegExp>} */
-Libraries.SyntaxHighlighter.regexLib;
+Libraries.SyntaxHighlighter.prototype.regexLib;
 
 
 /** @const */

botanjs/src/externs/System.Cycle.js

@@ -1,17 +1,29 @@
 /** @constructor */
 System.Cycle = function (){}
 
-/** @type {Function} */
-System.Cycle.next;
+/**
+ * @param {function(): void} callback
+ */
+System.Cycle.prototype.next = function(callback) {};
 
-/** @type {Function} */
-System.Cycle.delay;
+/**
+ * @param {function(): void} callback
+ * @param {number} ms
+ */
+System.Cycle.prototype.delay = function(callback, ms) {};
 
-/** @type {Function} */
-System.Cycle.perma;
+/**
+ * @param {string} id
+ * @param {function(): void} callback
+ * @param {number} intvl
+ * @return {boolean}
+ */
+System.Cycle.prototype.perma = function(id, callback, intvl){};
 
-/** @type {Function} */
-System.Cycle.permaRemove;
+/**
+ * @param {function(string): void} callback
+ */
+System.Cycle.prototype.permaRemove = function(callback) {};
 
 /** @type {System.Tick} */
-System.Cycle.TICK;
+System.Cycle.prototype.TICK;

botanjs/src/externs/System.Log.js

@@ -1,16 +1,32 @@
-/** @constructor */
-System.Log = function (){}
+/**
+ * @constructor
+ */
+System.Log = function() {};
 
-/** @type {Function} */
-System.Log.writeLine;
-/** @type {Function} */
-System.Log.registerHandler;
-/** @type {Function} */
-System.Log.removeHandler;
+/**
+ * @param {*} mesg
+ * @param {number=} type
+ * @return {void}
+ */
+System.Log.prototype.writeLine = function(mesg, type) {};
 
-/** @const */
-System.Log.ERROR;
-/** @const */
-System.Log.INFO;
-/** @const */
-System.Log.SYSTEM;
+/**
+ * @param {function(*, number): void} func
+ * @return {number}
+ */
+System.Log.prototype.registerHandler = function(func) {};
+
+/**
+ * @param {number} index
+ * @return {void}
+ */
+System.Log.prototype.removeHandler = function(index) {};
+
+/** @const {number} */
+System.Log.prototype.ERROR;
+
+/** @const {number} */
+System.Log.prototype.INFO;
+
+/** @const {number} */
+System.Log.prototype.SYSTEM;

botanjs/src/externs/System.Tick.js

@@ -11,3 +11,6 @@ System.Tick.prototype.stop;
 
 /** @type {Array} */
 System.Tick.prototype.steppers;
+
+/** @type {number} */
+System.Tick.prototype.count;