Merge remote-tracking branch 'upstream/master' into webgl-point-merge

2014-11-10 15:40:03 +01:00
parent 6c80ddcb14 ce879e115f
commit 501e7456c0
24 changed files with 187 additions and 227 deletions
@@ -474,7 +474,9 @@ olx.ViewOptions.prototype.constrainRotation;


 /**
- * Enable rotation. Default is `true`.
+ * Enable rotation. Default is `true`. If `false` a rotation constraint that
+ * always sets the rotation to zero is used. The `constrainRotation` option
+ * has no effect if `enableRotation` is `false`.
 * @type {boolean|undefined}
 * @api
 */