Merge branch 'master' into doc-tags (f9d23a72) · Commits · extjs / jsduck

js-classes/Date.js

+19 −18

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@

		/**
		* @method getDate
		* Returns the numeric value corresponding to the current time.
		* Returns the day of the month for the specified date according to local time.
		*
		* The second statement below assigns the value 25 to the variable `day`, based on the value of the
		* `Date` object `Xmas95`.
		@@ -247,7 +247,7 @@

		/**
		* @method getDay
		* Returns the numeric value corresponding to the current time.
		* Returns the day of the week for the specified date according to local time.
		*
		* The value returned by `getDay` is an integer corresponding to the day of the week: 0 for Sunday, 1
		* for Monday, 2 for Tuesday, and so on.
		@@ -264,7 +264,7 @@

		/**
		* @method getFullYear
		* Returns the numeric value corresponding to the current time.
		* Returns the year of the specified date according to local time.
		*
		* The value returned by `getFullYear` is an absolute number. For dates between the years 1000 and
		* 9999, `getFullYear` returns a four-digit number, for example, 1995. Use this function to make sure
		@@ -282,7 +282,7 @@

		/**
		* @method getHours
		* Returns the numeric value corresponding to the current time.
		* Returns the hour for the specified date according to local time.
		*
		* The second statement below assigns the value 23 to the variable `hours`, based on the value of the
		* `Date` object `Xmas95`.
		@@ -295,7 +295,7 @@

		/**
		* @method getMilliseconds
		* Returns the numeric value corresponding to the current time.
		* Returns the milliseconds in the specified date according to local time.
		*
		* The following example assigns the milliseconds portion of the current time to the variable ms.
		*
		@@ -308,7 +308,7 @@

		/**
		* @method getMinutes
		* Returns the numeric value corresponding to the current time.
		* Returns the minutes in the specified date according to local time.
		*
		* The second statement below assigns the value 15 to the variable `minutes`, based on the value of
		* the `Date` object `Xmas95`.
		@@ -321,7 +321,7 @@

		/**
		* @method getMonth
		* Returns the numeric value corresponding to the current time.
		* Returns the month in the specified date according to local time.
		*
		* The second statement below assigns the value 11 to the variable `month`, based on the value of the
		* `Date` object `Xmas95`.
		@@ -334,7 +334,7 @@

		/**
		* @method getSeconds
		* Returns the numeric value corresponding to the current time.
		* Returns the seconds in the specified date according to local time.
		*
		* The second statement below assigns the value 30 to the variable `secs`, based on the value of the
		* `Date` object `Xmas95`.
		@@ -347,7 +347,8 @@

		/**
		* @method getTime
		* Returns the numeric value corresponding to the current time.
		* Returns the numeric value corresponding to the time for the specified date according to
		* universal time.
		*
		* The value returned by the `getTime` method is the number of milliseconds since 1 January 1970
		* 00:00:00 UTC. You can use this method to help assign a date and time to another `Date` object.
		@@ -381,7 +382,7 @@

		/**
		* @method getTimezoneOffset
		* Returns the numeric value corresponding to the current time.
		* Returns the time-zone offset from UTC, in minutes, for the current locale.
		*
		* The time-zone offset is the difference, in minutes, between UTC and local time. Note that this
		* means that the offset is positive if the local timezone is behind UTC and negative if it is ahead.
		@@ -396,7 +397,7 @@

		/**
		* @method getUTCDate
		* Returns the numeric value corresponding to the current time.
		* Returns the day (date) of the month in the specified date according to universal time.
		*
		* The following example assigns the day portion of the current date to the variable `d`.
		*
		@@ -409,7 +410,7 @@

		/**
		* @method getUTCDay
		* Returns the numeric value corresponding to the current time.
		* Returns the day of the week in the specified date according to universal time.
		*
		* The following example assigns the weekday portion of the current date to the variable `weekday`.
		*
		@@ -423,7 +424,7 @@

		/**
		* @method getUTCFullYear
		* Returns the numeric value corresponding to the current time.
		* Returns the year in the specified date according to universal time.
		*
		* The following example assigns the four-digit value of the current year to the variable `yr`.
		*
		@@ -436,7 +437,7 @@

		/**
		* @method getUTCHours
		* Returns the numeric value corresponding to the current time.
		* Returns the hours in the specified date according to universal time.
		*
		* The following example assigns the hours portion of the current time to the variable `hrs`.
		*
		@@ -449,7 +450,7 @@

		/**
		* @method getUTCMilliseconds
		* Returns the numeric value corresponding to the current time.
		* Returns the milliseconds in the specified date according to universal time.
		*
		* The following example assigns the milliseconds portion of the current time to the variable `ms`.
		*
		@@ -462,7 +463,7 @@

		/**
		* @method getUTCMinutes
		* Returns the numeric value corresponding to the current time.
		* Returns the minutes in the specified date according to universal time.
		*
		* The following example assigns the minutes portion of the current time to the variable `min`.
		*
		@@ -475,7 +476,7 @@

		/**
		* @method getUTCMonth
		* Returns the numeric value corresponding to the current time.
		* Returns the month of the specified date according to universal time.
		*
		* The following example assigns the month portion of the current date to the variable `mon`.
		*
		@@ -488,7 +489,7 @@

		/**
		* @method getUTCSeconds
		* Returns the numeric value corresponding to the current time.
		* Returns the seconds in the specified date according to universal time.
		*
		* The following example assigns the seconds portion of the current time to the variable `sec`.
		*

lib/jsduck/js/ast.rb

+2 −2

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ module JsDuck
		make_class(var["id"].to_s, var["right"])

		# function Foo() {}
		elsif ast.function? && class_name?(ast["id"].to_s)
		elsif ast.function? && class_name?(ast["id"].to_s \|\| "")
		make_class(ast["id"].to_s)

		# { ... }
		@@ -85,7 +85,7 @@ module JsDuck

		# function foo() {}
		elsif ast.function?
		make_method(ast["id"].to_s, ast)
		make_method(ast["id"].to_s \|\| "", ast)

		# foo = function() {}
		elsif exp && exp.assignment_expression? && exp["right"].function?

spec/ast_spec.rb

+5 −1

Original line number	Diff line number	Diff line
		@@ -90,10 +90,14 @@ describe JsDuck::Js::Ast do
		detect("/** */ var foo = Ext.emptyFn").should == :method
		end

		it "anonymous function" do
		it "anonymous function as expression" do
		detect("/** */ (function(){})").should == :method
		end

		it "anonymous function as parameter" do
		detect("doSomething('blah', /** */ function(){});").should == :method
		end

		it "object property initialized with function" do
		detect(<<-EOS).should == :method
		Foo = {

template/app/view/Viewport.js

+0 −3

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ Ext.define('Docs.view.Viewport', {
		{
		id: 'loginContainer',
		xtype: 'authHeaderForm',
		width: 500,
		padding: '10 20 0 0'
		},
		{
		@@ -70,7 +69,6 @@ Ext.define('Docs.view.Viewport', {
		{
		region: 'center',
		layout: 'border',
		minWidth: 800,
		items: [
		{
		region: 'west',
		@@ -84,7 +82,6 @@ Ext.define('Docs.view.Viewport', {
		region: 'center',
		id: 'center-container',
		layout: 'fit',
		minWidth: 800,
		border: false,
		padding: '5 10',
		items: {

template/resources/sass/_global.scss

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ html {
		body {
		-webkit-font-smoothing: antialiased;
		font: 13px / 1.231 $docs-font;
		min-width: 980px;
		color: $docs-text-color;
		background: $docs-bg-color;
		min-height: 100%; }