remove time and watch displays on newMeasure and newAccuracy page #58

Toolwatchapp · Jan 31, 2016 · eb28986 · eb28986
1 parent 09b1457
commit eb28986
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/application/controllers/Measures.php b/application/controllers/Measures.php
@@ -205,10 +205,7 @@ public function new_measure() {
 
 		$this->event->add(MEASURE_LOAD);
 
-		array_push($this->_headerData['javaScripts'], "watch.animation",
-			"time",
-			"input.time.logic"
-		);
+		array_push($this->_headerData['javaScripts'], "input.time.logic");
 
 		$this->_headerData['headerClass'] = 'blue';
 		$this->load->view('header', $this->_headerData);
@@ -242,11 +239,8 @@ public function get_accuracy() {
 
 			$this->event->add(ACCURACY_LOAD);
 
-			$this->_headerData['headerClass'] = 'blue';
-			array_push($this->_headerData['javaScripts'], "watch.animation",
-				"time",
-				"input.time.logic"
-			);
+			array_push($this->_headerData['javaScripts'], "input.time.logic");
+
 			$this->load->view('header', $this->_headerData);
 
 			$this->_bodyData['selectedWatch'] = $this->watch->getWatch($this->input->post('watchId'));

diff --git a/application/views/measure/get-accuracy.php b/application/views/measure/get-accuracy.php
@@ -107,6 +107,4 @@ class="btn btn-primary  btn-lg">
         </div>
     </div>
     <img style="display:none" id="watch" src="<?php echo img_url('flatwatch-blank.png');?>">
-
-    <?php $this->load->view("time");?>
 </div>
diff --git a/application/views/measure/new-measure.php b/application/views/measure/new-measure.php
@@ -54,5 +54,4 @@ class="btn btn-primary  btn-lg">
             </form>
         </div>
     </div>
-    <?php $this->load->view("time");?>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,4 @@ class="btn btn-primary btn-lg"> @@
             </div>
         </div>
         <img style="display:none" id="watch" src="<?php echo img_url('flatwatch-blank.png');?>">
-        <?php $this->load->view("time");?>
     </div>