html5shiv & respond.js from components; codacy issues fixed

BigAndini · Jul 17, 2017 · dff9a65 · dff9a65
1 parent d363da9
commit dff9a65
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 521 deletions.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,9 @@
         "components/jquery": "2.2.4",
         "components/jqueryui": "1.10.4",
         "components/font-awesome": "4.3.0",
-        "trentrichardson/jquery-timepicker-addon": "1.6.3"
+        "trentrichardson/jquery-timepicker-addon": "1.6.3",
+        "afarkas/html5shiv": "3.7.3",
+        "rogeriopradoj/respond": "1.4.2"
     },
     "require-dev": {
 

diff --git a/module/Application/view/layout/admin.phtml b/module/Application/view/layout/admin.phtml
@@ -33,8 +33,8 @@
             ->appendFile($this->basePath() . '/js/custom_backend.js')
             ->appendFile($this->basePath() . '/vendor/raphael/raphael.min.js')
             ->appendFile($this->basePath() . '/vendor/morrisjs/morris.min.js')
-            ->prependFile($this->basePath() . '/js/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9',))
-            ->prependFile($this->basePath() . '/js/html5shiv.js',   'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath() . '/components/respond/respond-built.js', 'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath() . '/components/html5shiv/html5shiv-built.js',   'text/javascript', array('conditional' => 'lt IE 9',))
         ; ?>
 
     </head>

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -34,14 +34,13 @@
         <?php echo $this->headScript()
             ->prependFile($this->basePath() . '/components/bootstrap/js/bootstrap.min.js')
             ->prependFile($this->basePath() . '/components/jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js')
-            ->prependFile($this->basePath() . '/js/multidatespicker/jquery-ui.multidatespicker.min.js')
             ->prependFile($this->basePath() . '/components/jquery-ui/jquery-ui.min.js')
             ->prependFile($this->basePath() . '/components/jquery/jquery.min.js')        
             ->prependFile($this->basePath() . '/js/jquery.cookiecuttr.js')
             ->prependFile($this->basePath() . '/js/jquery.cookie.js')
             ->appendFile($this->basePath() . '/js/custom.js')
-            ->prependFile($this->basePath() . '/js/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9',))
-            ->prependFile($this->basePath() . '/js/html5shiv.js',   'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath() . '/components/respond/respond-built.js', 'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath() . '/components/html5shiv/html5shiv-built.js',   'text/javascript', array('conditional' => 'lt IE 9',))
         ; ?>
 
 

diff --git a/module/Application/view/layout/onsite.phtml b/module/Application/view/layout/onsite.phtml
@@ -31,8 +31,8 @@
             ->prependFile($this->basePath() . '/components/jquery-ui/jquery-ui.min.js')
             ->prependFile($this->basePath() . '/components/jquery/jquery.min.js')        
             ->appendFile($this->basePath() . '/js/custom_onsite.js')
-            ->prependFile($this->basePath() . '/js/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9',))
-            ->prependFile($this->basePath() . '/js/html5shiv.js',   'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath() . '/components/respond/respond-built.js', 'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath() . '/components/html5shiv/html5shiv-built.js',   'text/javascript', array('conditional' => 'lt IE 9',))
         ; ?>
 
     </head>

diff --git a/module/ErsBase/src/ErsBase/Service/StatusService.php b/module/ErsBase/src/ErsBase/Service/StatusService.php
@@ -87,7 +87,7 @@ public function setPackageStatus(Entity\Package $package, $status, $flush=true)
         foreach($package->getItems() as $item) {
             if(!in_array($item->getStatus()->getValue(), $ignore)) {
                 if($item->getStatus()->getValue() != $status->getValue()) {
-                    echo "set item (".$item->getId().") status from ".$item->getStauts()->getValue()." to ".$status->getValue().PHP_EOL;
+                    error_log("set item (".$item->getId().") status from ".$item->getStauts()->getValue()." to ".$status->getValue());
                 }
                 $this->setItemStatus($item, $status, false);
             }