Don't double trigger click events. Fixes #1.

bayleedev · May 26, 2015 · 4effad1 · 4effad1
1 parent 8911a6c
commit 4effad1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/index.html b/app/index.html
@@ -44,6 +44,7 @@
         <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
       <![endif]-->
       <div ng-view></div>
+      <div keypress-events></div>
     </div>
   </div>
 

diff --git a/app/play/play.html b/app/play/play.html
@@ -11,7 +11,7 @@ <h3>
     <div class="back input code">{{input}}</div>
   </div>
 </div>
-<div class="col-md-6" keypress-events>
+<div class="col-md-6">
   <button class="btn btn-default dot" ng-click="trigger('.')" />&#46;</button>
   <button class="btn btn-default dash" ng-click="trigger('-')" />&#45;</button>
 </div>
diff --git a/app/play/play.js b/app/play/play.js
@@ -104,6 +104,7 @@ controller('PlayCtrl', [
 
       // Listen for button pushes
       $scope.trigger = function(char) {
+        console.log('button trigger');
         var e = {};
         if (char === '.') {
           e.which = this.keys.dot;
@@ -114,7 +115,7 @@ controller('PlayCtrl', [
       };
 
       $scope.safeApply = function(fn) {
-        var phase = this.$root.$$phase;
+        var phase = this.$root && this.$root.$$phase || '';
         if(phase == '$apply' || phase == '$digest') {
           if(fn && (typeof(fn) === 'function')) {
             fn();