From b69c6cba6e60475e38a186b4f2e735983946bbed Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 1 Oct 2011 17:16:11 +0200
Subject: [PATCH] Remove $ from property names.

---
 fonts.js  |  6 +++---
 worker.js | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fonts.js b/fonts.js
index da8082fc5..1fb7577b1 100755
--- a/fonts.js
+++ b/fonts.js
@@ -501,8 +501,8 @@ var FontShape = (function FontShape() {
     var italic = this.italic ? 'italic' : 'normal';
     this.fontFallback = this.serif ? 'serif' : 'sans-serif';
 
-    this.$name1 = italic + ' ' + bold + ' ';
-    this.$name2 = 'px "' + name + '", "';
+    this.namePart1 = italic + ' ' + bold + ' ';
+    this.namePart2 = 'px "' + name + '", "';
     
     this.supported = Object.keys(this.encoding).length != 0;
 
@@ -517,7 +517,7 @@ var FontShape = (function FontShape() {
   constructor.prototype = {
     getRule: function fonts_getRule(size, fallback) {
       fallback = fallback || this.fontFallback;
-      return this.$name1 + size + this.$name2 + fallback + '"';
+      return this.namePart1 + size + this.namePart2 + fallback + '"';
     },
     
     charsToUnicode: function fonts_chars2Unicode(chars) {
diff --git a/worker.js b/worker.js
index b7347050b..deded8eb8 100644
--- a/worker.js
+++ b/worker.js
@@ -115,11 +115,11 @@ var Promise = (function() {
     // If you build a promise and pass in some data it's already resolved.
     if (data != null) {
       this.isResolved = true;
-      this.$data = data;
+      this._data = data;
       this.hasData = true;
     } else {
       this.isResolved = false;      
-      this.$data = EMPTY_PROMISE;
+      this._data = EMPTY_PROMISE;
     }
     this.callbacks = [];
   };
@@ -131,29 +131,29 @@ var Promise = (function() {
       if (data === undefined) {
         return;
       }
-      if (this.$data !== EMPTY_PROMISE) {
+      if (this._data !== EMPTY_PROMISE) {
         throw "Promise " + this.name + ": Cannot set the data of a promise twice";
       }
-      this.$data = data;
+      this._data = data;
       this.hasData = true;
 
-      if (this.$onDataCallback) {
-        this.$onDataCallback(data);
+      if (this.onDataCallback) {
+        this.onDataCallback(data);
       }
     },
     
     get data() {
-      if (this.$data === EMPTY_PROMISE) {
+      if (this._data === EMPTY_PROMISE) {
         throw "Promise " + this.name + ": Cannot get data that isn't set";
       }
-      return this.$data;
+      return this._data;
     },
 
     onData: function(callback) {
-      if (this.$data !== EMPTY_PROMISE) {
-        callback(this.$data);
+      if (this._data !== EMPTY_PROMISE) {
+        callback(this._data);
       } else {
-        this.$onDataCallback = callback;
+        this.onDataCallback = callback;
       }
     },