Merge pull request #1258 from cmgustavo/feature/01-remove-peerjs

Feature: remove peerjs

views/copayers.html

@@ -51,10 +51,10 @@
 
         <div class="box-setup-copayers p20">
           <div class="oh">
-            <div ng-include="'views/includes/video.html'"></div> 
+            <div ng-include="'views/includes/copayer.html'"></div> 
             <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
               <img
-              class="waiting br100 no-video"
+              class="waiting br100"
               ng-if="!hasVideo(copayer)"
               src="./img/satoshi.gif"
               alt="Waiting Copayer"

views/includes/copayer.html

@@ -1,17 +1,9 @@
-<div ng-controller="VideoController">
-  <div class="video-box" ng-repeat="copayer in copayersList()">
-    <video
-      ng-if="hasVideo(copayer)"
-      peer="{{copayer}}" avatar autoplay
-      ng-class="true || isConnected(copayer) ? 'online' : 'offline'"
-      ng-src="{{getVideoURL(copayer)}}"></video>
-
+<div ng-controller="CopayersController">
+  <div class="copay-box" ng-repeat="copayer in copayersList()">
     <img
-      class="br100 no-video"
-      ng-if="!hasVideo(copayer)"
-      ng-class="true || isConnected(copayer) ? 'online' : 'offline'"
+      class="br100 online"
       src="./img/satoshi.gif"
-      alt="{{copayer}}"
+      alt="{{copayer.peerId}}"
       width="70">
 
     <div

views/includes/peer-list.html

@@ -1,55 +1,22 @@
-<div ng-controller="VideoController" class="copayers">
-  <div>
-    <h3>
-      <i class="fi-torsos-all size-21 m20r"></i>
-      Copayers
-      <small class="m15l">
-        {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
-      </small>
-    </h3>
-  </div>
-  
+<div ng-controller="CopayersController" class="copayers">
+  <h3>
+    <i class="fi-torsos-all size-21 m20r"></i>
+    Copayers
+    <small class="m15l">
+      {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
+    </small>
+  </h3>
 
-  <ul class="copayer-list" ng-repeat="copayer in copayers">
-    <li class="ellipsis">
-      <video
-        ng-if="hasVideo(copayer)"
-        peer="{{copayer}}" avatar autoplay
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        ng-src="{{getVideoURL(copayer)}}"></video>
+  <div class="copay-box-small" ng-repeat="copayer in copayers">
+    <img
+      class="br100 online"
+      src="./img/satoshi.gif"
+      alt="{{copayer.peerId}}"
+      width="30">
 
-      <img 
-        class="br100 oh no-video m20r"
-        ng-if="!hasVideo(copayer)"
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        src="./img/satoshi.gif"
-        alt="{{copayer}}"
-        width="70">
-
-      <span ng-show="copayer.index == 0">Me</span>
-      <span ng-show="copayer.index > 0">{{copayer.nick}}</span>
-      <span class="btn-copy" clip-copy="copayer.peerId"></span>
-    </li>
-  </ul>
-  <div class="copayer-list-small-height" ng-repeat="copayer in copayers">
-    <span class="left" class="has-tip" tooltip-placement="top" tooltip="{{copayer.nick}}">
-      <video
-        ng-if="hasVideo(copayer)"
-        peer="{{copayer}}" avatar autoplay
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        ng-src="{{getVideoURL(copayer)}}"></video>
-
-      <img 
-        class="br100 oh no-video m20r"
-        ng-if="!hasVideo(copayer)"
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        src="./img/satoshi.gif"
-        alt="{{copayer}}"
-        width="70">
-
-      <!-- <span ng-show="copayer.index == 0">Me</span>
-      <span ng-show="copayer.index > 0">{{copayer.nick}}</span>
-      <span class="btn-copy" clip-copy="copayer.peerId"></span> -->
-    </span>
-  </div>
+    <div class="ellipsis" tooltip-placement="top" tooltip="{{copayer.nick}}">
+      <small class="text-gray" ng-show="copayer.index == 0">Me</small>
+      <small class="text-gray" ng-show="copayer.index > 0">{{copayer.nick}}</small>
+    </div>
+  </div> 
 </div>

views/settings.html

@@ -31,11 +31,6 @@
             <select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" required>
             </select>
           </fieldset>
-          <fieldset>
-            <legend>Videoconferencing</legend>
-            <input id="disableVideo-opt" type="checkbox" ng-model="disableVideo" class="form-control">
-            <label for="disableVideo-opt">Disable videoconferencing (for slow networks)</label>
-          </fieldset>
           <fieldset>
             <legend>Insight API server</legend>
             <label for="insight-host">Host</label>