Merge branch 'release/releases-1.2.6'

dummys · Jan 20, 2013 · 6b13bfa · 6b13bfa
2 parents 37c55ef + 4b5d993
commit 6b13bfa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.6
+ * Fix: Package file UeberDB reference
+ * New #users EEJS block for plugins
+
 # 1.2.5
  * Create timeslider EEJS blocks for plugins
  * Allow for "more messages" to be loaded in chat

diff --git a/src/node/db/API.js b/src/node/db/API.js
@@ -46,7 +46,7 @@ exports.createGroupPad = groupManager.createGroupPad;
 /**PADLIST FUNCTION****/
 /**********************/
 
-exports.listAllPads = padManager.getPads;
+exports.listAllPads = padManager.listAllPads;
 
 /**********************/
 /**AUTHOR FUNCTIONS****/

diff --git a/src/node/db/PadManager.js b/src/node/db/PadManager.js
@@ -158,12 +158,12 @@ exports.getPad = function(id, text, callback)
   }
 }
 
-exports.getPads = function(callback)
+exports.listAllPads = function(callback)
 {
   if(callback != null){
-    callback(null,padList.getPads());
+    callback(null,{padIDs: padList.getPads()});
   }else{
-    return padList.getPads();
+    return {padIDs: padList.getPads()};
   }
 }
 

diff --git a/src/package.json b/src/package.json
@@ -16,7 +16,7 @@
                       "require-kernel"          : "1.0.5",
                       "resolve"                 : "0.2.x",
                       "socket.io"               : "0.9.x",
-                      "ueberDB"                 : "0.1.x",
+                      "ueberDB"                 : "0.1.9",
                       "async"                   : "0.1.x",
                       "express"                 : "3.x",
                       "connect"                 : "2.4.x",
@@ -46,5 +46,5 @@
   "engines"        : { "node" : ">=0.6.0",
                        "npm"  : ">=1.0"
                      }, 
-  "version"        : "1.2.5"
+  "version"        : "1.2.6"
 }
diff --git a/src/templates/pad.html b/src/templates/pad.html
@@ -153,6 +153,7 @@
         </div>
 
         <div id="users">
+            <% e.begin_block("userlist"); %>
             <div id="connectionstatus"></div>
             <div id="myuser">
                 <div id="mycolorpicker">
@@ -173,6 +174,7 @@
                 <div id="nootherusers"></div>
             </div>
             <div id="userlistbuttonarea"></div>
+            <% e.end_block(); %>
         </div>
 
         <div id="editorcontainerbox">