diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage/core/logger.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/core/logger.js')
-rwxr-xr-x | node_modules/montage/core/logger.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/node_modules/montage/core/logger.js b/node_modules/montage/core/logger.js index 63bcabe3..ccb75b7a 100755 --- a/node_modules/montage/core/logger.js +++ b/node_modules/montage/core/logger.js | |||
@@ -28,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | /** | 30 | /** |
31 | @module montage/core/logger | 31 | @module montage/core/logger |
32 | @requires montage/core/core | 32 | @requires montage/core/core |
33 | */ | 33 | */ |
34 | var Montage = require("montage").Montage, | 34 | var Montage = require("montage").Montage, |
35 | Logger, | 35 | Logger, |
@@ -61,7 +61,7 @@ getFunctionName = function(montageObject) { | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | /** | 63 | /** |
64 | @function | 64 | @function |
65 | @param {Date} date TODO | 65 | @param {Date} date TODO |
66 | @returns length hours, minutes, seconds, date.getMilliseconds() | 66 | @returns length hours, minutes, seconds, date.getMilliseconds() |
67 | @private | 67 | @private |
@@ -75,20 +75,20 @@ toTimeString = function(date) { | |||
75 | } | 75 | } |
76 | }; | 76 | }; |
77 | /** | 77 | /** |
78 | @function | 78 | @function |
79 | @private | 79 | @private |
80 | */ | 80 | */ |
81 | emptyLoggerFunction = function() { | 81 | emptyLoggerFunction = function() { |
82 | }; | 82 | }; |
83 | /** | 83 | /** |
84 | @function | 84 | @function |
85 | @private | 85 | @private |
86 | */ | 86 | */ |
87 | consoleLog = function() { | 87 | consoleLog = function() { |
88 | console.log(arguments); | 88 | console.log(arguments); |
89 | }; | 89 | }; |
90 | /** | 90 | /** |
91 | @function | 91 | @function |
92 | @private | 92 | @private |
93 | */ | 93 | */ |
94 | consoleLogMontage = function() { | 94 | consoleLogMontage = function() { |