Merge pull request #223 from giusepped/#216-searchbug

working search
giusepped · Sep 30, 2015 · 377f254 · 377f254
2 parents dbfa831 + a510776
commit 377f254
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/public/js/angular/controller/canvasController.js b/public/js/angular/controller/canvasController.js
@@ -110,10 +110,6 @@ homepage.controller('CanvasController', ['$scope', 'CanvasProvider', '$timeout',
 
   colourPaletteImg.src = 'images/ColorWheel-Base.png';
 
-  setInterval(function() {
-    socket.emit('canvas', [imgID(), board.toDataURL('image/png')]);
-  }, 5000);
-
   function joinRoom() {
     socket.emit('joinRoom', [imgID(), username]);
   }

diff --git a/public/js/angular/controller/homepageController.js b/public/js/angular/controller/homepageController.js
@@ -29,7 +29,7 @@ homepage.controller('HomeController', ['$scope', '$q', 'CanvasProvider', '$rootS
   }
 
   $scope.searchBy = function(type, param) {
-    CanvasProvider.searchFor(type, param).then(function(results) {
+    CanvasProvider.searchBy(type, param).then(function(results) {
       $scope.boards = results;
     })
   }

diff --git a/public/js/angular/templates/homepage.html b/public/js/angular/templates/homepage.html
@@ -9,7 +9,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand navbar-header" ng-click="searchFor('')">VARY-PIXEL</a>
+          <a class="navbar-brand navbar-header" ng-click="searchBy('description', '')">VARY-PIXEL</a>
         </div>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
           <ul class="nav navbar-nav">
@@ -29,7 +29,7 @@
           <div class="nav-forms">
             <form class="searchbox navbar-form navbar-right">
               <input ng-model="searchString"class="form-horizontal" type="text"/>
-              <button class="btn btn-default" type="button" ng-click="searchBy('objectId', searchString)">Search</button>
+              <button class="btn btn-default" type="button" ng-click="searchBy('description', searchString)">Search</button>
             </form>
             <form class="makenew navbar-form navbar-right">
               <button class="glyphicon glyphicon-plus" ng-click="userAction('makeNew')"></button>
@@ -110,6 +110,3 @@ <h4>{{ board.get('description') }}</h4>
     </section>
   </section>
 </section>
-
-<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-560acde0be60b897" async="async">
-</script>
diff --git a/server.js b/server.js
@@ -60,7 +60,4 @@ io.on('connection', function(socket) {
     socket.broadcast.to(imgID).emit('coordinates', data);
   });
 
-  socket.on('canvas', function(data) {
-    canvases[data[0]] = [users[0].id, '1'];
-  });
 });