Merge pull request #2401 from MPOS/development

[UPDATE] jQuery, SoundJS, MPOS 1.0.1

CHANGELOG.md

@@ -1,4 +1,10 @@
+1.0.1 (Apr 15th 2015)
+---------------------
+
+* Updated jQuery and SoundJS
+* Removed unneeded JS files
+
 1.0.0 (Jan 18th 2015)
---------------------
+---------------------
 
 * First (non-beta) public release of MPOS

include/pages/admin/dashboard.inc.php

@@ -20,7 +20,7 @@ $online_versions = $tools->getOnlineVersions();
 
 // Fetch version information
 $version['CURRENT'] = array('DB' => DB_VERSION, 'CONFIG' => CONFIG_VERSION, 'CORE' => MPOS_VERSION);
-$version['INSTALLED'] = array('DB' => $setting->getValue('DB_VERSION'), 'CONFIG' => $config['version'], 'CORE' => $online_versions['MPOS_VERSION']);
+$version['INSTALLED'] = array('DB' => $setting->getValue('DB_VERSION'), 'CONFIG' => $config['version'], 'CORE' => MPOS_VERSION);
 $version['ONLINE'] = array('DB' => $online_versions['DB_VERSION'], 'CONFIG' => $online_versions['CONFIG_VERSION'], 'CORE' => $online_versions['MPOS_VERSION']);
 
 // Fetch our cron list $aMonitorCrons

include/version.inc.php

@@ -1,7 +1,7 @@
 <?php
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
-define('MPOS_VERSION', '1.0.0');
+define('MPOS_VERSION', '1.0.1');
 define('DB_VERSION', '1.0.0');
 define('CONFIG_VERSION', '1.0.0');
 define('HASH_VERSION', 1);

templates/bootstrap/dashboard/default.tpl

@@ -1,6 +1,6 @@
 {if $smarty.session.AUTHENTICATED|default}
 <script src="{$PATH}/js/plugins/date.format.js"></script>
-<script src="{$PATH}/js/plugins/soundjs-0.5.2.min.js"></script>
+<script src="{$PATH}/js/plugins/soundjs-0.6.0.min.js"></script>
 
 <div class="row">
   <div class="col-lg-12">

templates/bootstrap/dashboard/js/api.tpl

@@ -10,14 +10,14 @@ $(document).ready(function(){
   if (!createjs.Sound.initializeDefaultPlugins()) {
     $('#togglesound').hide();
   // don't create object and hide toggle on mobile devices. must be started inside a touch event, else sound doesn't start
-  } else if (createjs.Sound.BrowserDetect.isIOS || createjs.Sound.BrowserDetect.isAndroid || createjs.Sound.BrowserDetect.isBlackberry) {
+  } else if (createjs.BrowserDetect.isIOS || createjs.BrowserDetect.isAndroid || createjs.BrowserDetect.isBlackberry) {
     $('#togglesound').hide();
   } else {
     var audioPath = "{/literal}{$PATH}{literal}/audio/";
-    var manifest = [ {id:"ding", src:"ding.ogg"} ];
+    var sound = [ {id:"ding", src:"ding.ogg"} ];
     var muteFlag = 1;
     createjs.Sound.alternateExtensionseExtensions = ["mp3"];
-    createjs.Sound.registerManifest(manifest, audioPath);
+    createjs.Sound.registerSounds(sound, audioPath);
     canCreateSoundJS = true;
   }
 

templates/bootstrap/master.tpl

@@ -26,7 +26,7 @@
   <link href="{$PATH}/css/design/{$GLOBAL.config.website_design}.css" rel="stylesheet">
   {/if}
   
-  <script src="{$PATH}/js/jquery-2.1.1.min.js"></script>
+  <script src="{$PATH}/js/jquery-2.1.3.min.js"></script>
   <script src="{$PATH}/js/jquery.cookie.js"></script>
   <script src="{$PATH}/js/jquery.md5.js"></script>
   <script src="{$PATH}/js/bootstrap.min.js"></script>