Merge branch '2.7' into 2.8

fabpot · fabpot · commit 056733b6ed79 · 2016-06-29T07:29:29.000+02:00
* 2.7: removed dots at the end of @param and @return fixed typo
diff --git a/Resources/views/Collector/time.html.twig b/Resources/views/Collector/time.html.twig
@@ -160,7 +160,7 @@
         /**
          * Query an element with a CSS selector.
          *
-         * @param string selector a CSS-selector-compatible query string.
+         * @param string selector a CSS-selector-compatible query string
          *
          * @return DOMElement|null
          */
@@ -187,7 +187,7 @@
             /**
              * Check whether this event is a child event.
              *
-             * @return true if it is.
+             * @return true if it is
              */
             function isChildEvent(event)
             {
@@ -197,7 +197,7 @@
             /**
              * Check whether this event is categorized in 'section'.
              *
-             * @return true if it is.
+             * @return true if it is
              */
             function isSectionEvent(event)
             {
@@ -217,8 +217,8 @@
              *
              * @param request   the request object
              * @param max       <subjected for removal>
-             * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds).
-             * @param width     the width of the canvas.
+             * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds)
+             * @param width     the width of the canvas
              */
             this.drawOne = function(request, max, threshold, width)
             {

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@`
`160`	`160`	`/**`
`161`	`161`	`* Query an element with a CSS selector.`
`162`	`162`	`*`
`163`		`- * @param string selector a CSS-selector-compatible query string.`
	`163`	`+ * @param string selector a CSS-selector-compatible query string`
`164`	`164`	`*`
`165`	`165`	`* @return DOMElement\|null`
`166`	`166`	`*/`
`@@ -187,7 +187,7 @@`
`187`	`187`	`/**`
`188`	`188`	`* Check whether this event is a child event.`
`189`	`189`	`*`
`190`		`- * @return true if it is.`
	`190`	`+ * @return true if it is`
`191`	`191`	`*/`
`192`	`192`	`function isChildEvent(event)`
`193`	`193`	`{`
`@@ -197,7 +197,7 @@`
`197`	`197`	`/**`
`198`	`198`	`* Check whether this event is categorized in 'section'.`
`199`	`199`	`*`
`200`		`- * @return true if it is.`
	`200`	`+ * @return true if it is`
`201`	`201`	`*/`
`202`	`202`	`function isSectionEvent(event)`
`203`	`203`	`{`
`@@ -217,8 +217,8 @@`
`217`	`217`	`*`
`218`	`218`	`* @param request the request object`
`219`	`219`	`* @param max <subjected for removal>`
`220`		`- * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds).`
`221`		`- * @param width the width of the canvas.`
	`220`	`+ * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds)`
	`221`	`+ * @param width the width of the canvas`
`222`	`222`	`*/`
`223`	`223`	`this.drawOne = function(request, max, threshold, width)`
`224`	`224`	`{`