From 36697e053d0b8f3b5cc58fba274b5cd65cb219c2 Mon Sep 17 00:00:00 2001 From: Ryan LeFevre Date: Sat, 27 Jul 2013 13:56:08 -0400 Subject: [PATCH] Version bump --- api/LICENSE.html | 2 +- api/README.md.html | 2 +- api/assets/search_data.js | 2 +- api/class_index.html | 2 +- api/classes/Caman.html | 21 ++++++++++++++++++++- api/classes/Caman/Analyze.html | 2 +- api/classes/Caman/Blender.html | 2 +- api/classes/Caman/Calculate.html | 2 +- api/classes/Caman/Convert.html | 2 +- api/classes/Caman/Event.html | 2 +- api/classes/Caman/Filter.html | 2 +- api/classes/Caman/IO.html | 2 +- api/classes/Caman/Layer.html | 2 +- api/classes/Caman/Logger.html | 2 +- api/classes/Caman/Pixel.html | 2 +- api/classes/Caman/Plugin.html | 2 +- api/classes/Caman/Renderer.html | 2 +- api/classes/Caman/Store.html | 2 +- api/classes/CamanParser.html | 2 +- api/classes/Module.html | 2 +- api/classes/Util.html | 2 +- api/files/core/analyze.coffee.html | 2 +- api/files/core/autoload.coffee.html | 2 +- api/files/core/blender.coffee.html | 2 +- api/files/core/calculate.coffee.html | 2 +- api/files/core/caman.coffee.html | 2 +- api/files/core/convert.coffee.html | 2 +- api/files/core/event.coffee.html | 2 +- api/files/core/filter.coffee.html | 2 +- api/files/core/io.coffee.html | 2 +- api/files/core/layer.coffee.html | 2 +- api/files/core/pixel.coffee.html | 2 +- api/files/core/plugin.coffee.html | 2 +- api/files/core/renderer.coffee.html | 2 +- api/files/core/store.coffee.html | 2 +- api/files/core/util.coffee.html | 2 +- api/method_list.html | 8 ++++++++ bower.json | 2 +- dist/caman.full.js | 4 ++-- dist/caman.full.min.js | 2 +- dist/caman.full.pack.js | 2 +- dist/caman.js | 4 ++-- dist/caman.min.js | 2 +- dist/caman.pack.js | 2 +- docs/caman.html | 24 +++++++++++++++--------- package.json | 2 +- src/core/caman.coffee | 4 ++-- 47 files changed, 90 insertions(+), 57 deletions(-) diff --git a/api/LICENSE.html b/api/LICENSE.html index da11e826..1491712e 100644 --- a/api/LICENSE.html +++ b/api/LICENSE.html @@ -129,7 +129,7 @@
+
+ +
+

+ - (void) nodeFileReady(err, data) + (bound) +

+
@@ -1457,7 +1476,7 @@

Parameters:

 
  @version:
-    release: "4.1.1"
-    date: "4/8/2013"
+ release: "4.1.2" + date: "7/27/2013" @@ -661,14 +661,20 @@

caman.coffee

  initNode: ->
     Log.debug "Initializing for NodeJS"
 
+    if typeof @initObj is "string"
+      fs.readFile @initObj, @nodeFileReady
+    else
+      @nodeFileReady null, @initObj
+
+  nodeFileReady: (err, data) =>
+    throw err if err
+
     @image = new Image()
-    @image.onload = =>
-      Log.debug "Image loaded. Width = #{@imageWidth()}, Height = #{@imageHeight()}"
-      @canvas = new Canvas @imageWidth(), @imageHeight()
-      @finishInit()
+    @image.src = data
 
-    @image.onerror = (err) -> throw err
-    @image.src = @initObj
+ Log.debug "Image loaded. Width = #{@imageWidth()}, Height = #{@imageHeight()}" + @canvas = new Canvas @imageWidth(), @imageHeight() + @finishInit() @@ -903,7 +909,7 @@

caman.coffee

width: @canvas.width height: @canvas.height - Store.put @id, @ + Store.put @id, @ unless Caman.NodeJS @callback.call @,@ diff --git a/package.json b/package.json index ea8505e7..05710924 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "caman", - "version": "4.1.1", + "version": "4.1.2", "description": "Javascript (Ca)nvas (Man)ipulation for NodeJS and the browser", "keywords": ["canvas", "image", "manipulate", "filter", "image manipulation", "editing"], "homepage": "http://camanjs.com", diff --git a/src/core/caman.coffee b/src/core/caman.coffee index e5a7b770..3c7739a5 100644 --- a/src/core/caman.coffee +++ b/src/core/caman.coffee @@ -25,8 +25,8 @@ else class Caman extends Module # The current version. @version: - release: "4.1.1" - date: "4/8/2013" + release: "4.1.2" + date: "7/27/2013" # @property [Boolean] Debug mode enables console logging. @DEBUG: false