Skip to content
Browse files

Merge pull request #521 from linshun/iss1446_v2.0

issue #1446: fixed jsdoc comments
  • Loading branch information...
2 parents 7b6aba1 + 33f0edb commit 950f56dd3f17a62b2fd69ec7971a99e73c70c3c7 @linshun linshun committed Aug 27, 2012
View
24 cocos2d/CCDirector.js
@@ -92,30 +92,6 @@ cc.DEVICE_ORIENTATION_LANDSCAPE_RIGHT = 3;
*/
cc.DEVICE_MAX_ORIENTATIONS = 2;
-// Backward compatibility stuff
-/**
- * @constant
- * @type Number
- */
-cc.DEVICE_ORIENTATION_PORTRAIT = cc.DEVICE_ORIENTATION_PORTRAIT;
-
-/**
- * @constant
- * @type Number
- */
-cc.DEVICE_ORIENTATION_PORTRAIT_UPSIDE_DOWN = cc.DEVICE_ORIENTATION_PORTRAIT_UPSIDE_DOWN;
-
-/**
- * @constant
- * @type Number
- */
-cc.DEVICE_ORIENTATION_LANDSCAPE_LEFT = cc.DEVICE_ORIENTATION_LANDSCAPE_LEFT;
-
-/**
- * @constant
- * @type Number
- */
-cc.DEVICE_ORIENTATION_LANDSCAPE_RIGHT = cc.DEVICE_ORIENTATION_LANDSCAPE_RIGHT;
//----------------------------------------------------------------------------------------------------------------------
View
9 cocos2d/particle_nodes/CCParticleSystem.js
@@ -89,15 +89,6 @@ cc.PARTICLE_START_SIZE_EQUAL_TO_END_SIZE = -1;
cc.PARTICLE_START_RADIUS_EQUAL_TO_END_RADIUS = -1;
/**
- * backward compatible
- * @constant
- * @type Number
- */
-cc.PARTICLE_START_SIZE_EQUAL_TO_END_SIZE = cc.PARTICLE_START_SIZE_EQUAL_TO_END_SIZE;
-cc.PARTICLE_DURATION_INFINITY = cc.PARTICLE_DURATION_INFINITY;
-
-
-/**
* Gravity mode (A mode)
* @constant
* @type Number
View
9 cocos2d/platform/CCMacro.js
@@ -284,10 +284,13 @@ cc.RECT_POINTS_TO_PIXELS = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (point) {
};
-//
-// WebGL constants
-//
+
+/**
+ * WebGL constants
+ * @type {object}
+ */
var gl = gl || {};
+
/**
* @constant
* @type Number
View
5 cocos2d/platform/miniFramework.js
@@ -50,7 +50,12 @@ cc.Browser = {};
cc.$ = function (x) {
/** @lends cc.$# */
var parent = (this == cc) ? document : this;
+
+ /**
+ * @type {HTMLElement}
+ */
var el = (x instanceof HTMLElement) ? x : parent.querySelector(x);
+
if (el) {
/**
* find and return the child wth css selector (same as jquery.find)

0 comments on commit 950f56d

Please sign in to comment.
Something went wrong with that request. Please try again.