From 847bb6a5753a227dd3b196f20acdf95409439078 Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Sat, 17 Oct 2015 16:31:32 +0200 Subject: [PATCH 01/12] Fixed dialog "overlapping" if main character ID not found --- app/pathfinder.ini | 2 +- js/app/mappage.js | 2 +- js/app/ui/dialog/account_settings.js | 8 +++----- js/app/ui/dialog/map_settings.js | 2 +- js/app/util.js | 13 +++++++++++++ 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/pathfinder.ini b/app/pathfinder.ini index 1cf1dc981..7f676a92a 100644 --- a/app/pathfinder.ini +++ b/app/pathfinder.ini @@ -1,7 +1,7 @@ [PATHFINDER] NAME = "PATHFINDER" ; installed version (used for CSS/JS cache busting) -VERSION = "v0.0.13" +VERSION = "v0.0.14" ; contact information (DO NOT CHANGE) CONTACT = "https://github.com/exodus4d" ; source code (DO NOT CHANGE) diff --git a/js/app/mappage.js b/js/app/mappage.js index 2c923e458..e5fe24ab3 100644 --- a/js/app/mappage.js +++ b/js/app/mappage.js @@ -219,7 +219,7 @@ define([ if(userData.character === undefined){ // no active character found -> show settings dialog - Util.showNotify({title: 'Main character missing', text: 'Check API and set a main character', type: 'error'}); + Util.showNotify({title: 'Main character not set', text: 'Check your API data and set a main character', type: 'error'}); $(document).triggerMenuEvent('ShowSettingsDialog'); } diff --git a/js/app/ui/dialog/account_settings.js b/js/app/ui/dialog/account_settings.js index f4f1e36bf..ffb2c65ee 100644 --- a/js/app/ui/dialog/account_settings.js +++ b/js/app/ui/dialog/account_settings.js @@ -110,16 +110,14 @@ define([ */ $.fn.showSettingsDialog = function(options){ - // check if there is already a settings dialog open - var settingsDialog = $('#' + config.settingsDialogId); - - if(settingsDialog.length > 0){ + // check if there are other dialogs open + var openDialogs = Util.getOpenDialogs(); + if(openDialogs.length > 0){ return false; } var reroutePath = ''; - // check navigation buttons and show/hide them var checkNavigationButton = function(dialog){ var navigationBarElement = $(dialog).find('.' + config.dialogWizardNavigationClass); diff --git a/js/app/ui/dialog/map_settings.js b/js/app/ui/dialog/map_settings.js index d779ae4bb..0db1d5b53 100644 --- a/js/app/ui/dialog/map_settings.js +++ b/js/app/ui/dialog/map_settings.js @@ -7,7 +7,7 @@ define([ 'app/init', 'app/util', 'app/render', - 'bootbox', + 'bootbox' ], function($, Init, Util, Render, bootbox) { 'use strict'; diff --git a/js/app/util.js b/js/app/util.js index 9a5942221..bbe9a2993 100644 --- a/js/app/util.js +++ b/js/app/util.js @@ -36,6 +36,9 @@ define([ duration: 180 }, + // dialogs + dialogClass: 'modal-dialog', // class for all dialogs (bootstrap) + // map module mapModuleId: 'pf-map-module', // id for main map module mapTabBarId: 'pf-map-tabs' // id for map tab bar @@ -1499,6 +1502,15 @@ define([ return Init.currentSystemData; }; + + /** + * get all "open" dialog elements + * @returns {*|jQuery} + */ + var getOpenDialogs = function(){ + return $('.' + config.dialogClass).filter(':visible'); + }; + /** * formats a price string into an ISK Price * @param price @@ -1623,6 +1635,7 @@ define([ getCurrentUserInfo: getCurrentUserInfo, getCurrentCharacterLog: getCurrentCharacterLog, convertDateToString: convertDateToString, + getOpenDialogs: getOpenDialogs, formatPrice: formatPrice, redirect: redirect, logout: logout From 93686f4f8739c192a5d18572e46af7e5c51c96a9 Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Sat, 17 Oct 2015 18:47:47 +0200 Subject: [PATCH 02/12] close #52 fixed cache timings for corp/ally models in CCP API-calls. added new Gulp task for cache clearing, fixed "main" character auto-set on registration --- app/main/controller/api/user.php | 5 +- app/main/controller/ccpapicontroller.php | 6 +- app/main/controller/controller.php | 1 - gulpfile.js | 11 +- js/app/map/map.js | 1 - public/js/v0.0.13/app.js | 2 - public/js/v0.0.13/app.js.map | 1 - public/js/v0.0.13/app.js.src.js | 153 --------------- public/js/v0.0.13/app/landingpage.js | 15 -- public/js/v0.0.13/app/landingpage.js.map | 1 - public/js/v0.0.13/app/mappage.js | 33 ---- public/js/v0.0.13/app/mappage.js.map | 1 - public/js/v0.0.13/app/notification.js | 2 - public/js/v0.0.13/app/notification.js.map | 1 - public/js/v0.0.13/build.txt | 107 ---------- .../js/v0.0.13/lib/bootstrap-image-gallery.js | 2 - .../lib/bootstrap-image-gallery.js.map | 1 - .../lib/bootstrap-image-gallery.js.src.js | 89 --------- .../v0.0.13/lib/bootstrap2-toggle.min.js.map | 1 - .../lib/datatables/dataTables.bootstrap.js | 2 - .../datatables/dataTables.bootstrap.js.map | 1 - .../datatables/dataTables.bootstrap.js.src.js | 184 ------------------ .../extensions/tabletools/Readme.txt | 41 ---- .../js/dataTables.tableTools.min.js | 2 - .../js/dataTables.tableTools.min.js.map | 1 - .../js/dataTables.tableTools.min.js.src.js | 69 ------- .../tabletools/swf/copy_csv_xls.swf | Bin 2232 -> 0 bytes .../tabletools/swf/copy_csv_xls_pdf.swf | Bin 58845 -> 0 bytes .../js/v0.0.13/lib/jquery.fullscreen.min.js | 2 - .../v0.0.13/lib/jquery.fullscreen.min.js.map | 1 - public/js/v0.0.13/lib/jquery.min.map | 1 - public/js/v0.0.13/lib/require.js | 2 - public/js/v0.0.13/lib/require.js.map | 1 - public/js/v0.0.13/lib/require.js.src.js | 36 ---- 34 files changed, 17 insertions(+), 759 deletions(-) delete mode 100644 public/js/v0.0.13/app.js delete mode 100644 public/js/v0.0.13/app.js.map delete mode 100644 public/js/v0.0.13/app.js.src.js delete mode 100644 public/js/v0.0.13/app/landingpage.js delete mode 100644 public/js/v0.0.13/app/landingpage.js.map delete mode 100644 public/js/v0.0.13/app/mappage.js delete mode 100644 public/js/v0.0.13/app/mappage.js.map delete mode 100644 public/js/v0.0.13/app/notification.js delete mode 100644 public/js/v0.0.13/app/notification.js.map delete mode 100644 public/js/v0.0.13/build.txt delete mode 100644 public/js/v0.0.13/lib/bootstrap-image-gallery.js delete mode 100644 public/js/v0.0.13/lib/bootstrap-image-gallery.js.map delete mode 100644 public/js/v0.0.13/lib/bootstrap-image-gallery.js.src.js delete mode 100644 public/js/v0.0.13/lib/bootstrap2-toggle.min.js.map delete mode 100644 public/js/v0.0.13/lib/datatables/dataTables.bootstrap.js delete mode 100644 public/js/v0.0.13/lib/datatables/dataTables.bootstrap.js.map delete mode 100644 public/js/v0.0.13/lib/datatables/dataTables.bootstrap.js.src.js delete mode 100644 public/js/v0.0.13/lib/datatables/extensions/tabletools/Readme.txt delete mode 100644 public/js/v0.0.13/lib/datatables/extensions/tabletools/js/dataTables.tableTools.min.js delete mode 100644 public/js/v0.0.13/lib/datatables/extensions/tabletools/js/dataTables.tableTools.min.js.map delete mode 100644 public/js/v0.0.13/lib/datatables/extensions/tabletools/js/dataTables.tableTools.min.js.src.js delete mode 100644 public/js/v0.0.13/lib/datatables/extensions/tabletools/swf/copy_csv_xls.swf delete mode 100644 public/js/v0.0.13/lib/datatables/extensions/tabletools/swf/copy_csv_xls_pdf.swf delete mode 100644 public/js/v0.0.13/lib/jquery.fullscreen.min.js delete mode 100644 public/js/v0.0.13/lib/jquery.fullscreen.min.js.map delete mode 100644 public/js/v0.0.13/lib/jquery.min.map delete mode 100644 public/js/v0.0.13/lib/require.js delete mode 100644 public/js/v0.0.13/lib/require.js.map delete mode 100644 public/js/v0.0.13/lib/require.js.src.js diff --git a/app/main/controller/api/user.php b/app/main/controller/api/user.php index c4d24e9a1..b17007004 100644 --- a/app/main/controller/api/user.php +++ b/app/main/controller/api/user.php @@ -310,7 +310,7 @@ public function saveConfig($f3){ $settingsData = $data['settingsData']; try{ - $user = $this->_getUser(); + $user = $this->_getUser(0); // captcha is send -> check captcha if( @@ -433,6 +433,9 @@ public function saveConfig($f3){ foreach($apiModels as $apiModel){ $apiModel->delete(); } + + // get fresh updated user object (API info may have has changed) + $user = $this->_getUser(0); } // set main character diff --git a/app/main/controller/ccpapicontroller.php b/app/main/controller/ccpapicontroller.php index 065dce2fd..c91b4d323 100644 --- a/app/main/controller/ccpapicontroller.php +++ b/app/main/controller/ccpapicontroller.php @@ -110,11 +110,11 @@ public function updateCharacters($userApiModel){ $newCharacter = true; $characterId = (int)$attributeData['characterID']; - $characterModel->getById($characterId); + $characterModel->getById($characterId, 0); // check if corporation already exists if($attributeData['corporationID'] > 0){ - $corporationModel->getById($attributeData['corporationID']); + $corporationModel->getById($attributeData['corporationID'], 0); if( $corporationModel->dry() ){ $corporationModel->id = $attributeData['corporationID']; $corporationModel->name = $attributeData['corporationName']; @@ -125,7 +125,7 @@ public function updateCharacters($userApiModel){ // check if alliance already exists if($attributeData['allianceID'] > 0){ - $allianceModel->getById($attributeData['allianceID']); + $allianceModel->getById($attributeData['allianceID'], 0); if( $allianceModel->dry() ){ $allianceModel->id = $attributeData['allianceID']; $allianceModel->name = $attributeData['allianceName']; diff --git a/app/main/controller/controller.php b/app/main/controller/controller.php index 9cfeaf00e..a38f2f8c7 100644 --- a/app/main/controller/controller.php +++ b/app/main/controller/controller.php @@ -78,7 +78,6 @@ protected function getDB($database = 'PF'){ * @throws \Exception */ protected function _getUser($ttl = 5){ - $user = false; if( $this->f3->exists('SESSION.user.id') ){ diff --git a/gulpfile.js b/gulpfile.js index b68c4391a..8ae75cc96 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -21,7 +21,8 @@ var _src = { JS_LIBS: './js/lib/**/*', JS_BUILD: './build_js', JS_DIST: './public/js', - PACKAGE: './package.json' + PACKAGE: './package.json', + CACHE: './tmp/**/*.*' }; // Gulp plumber error handler @@ -156,6 +157,14 @@ gulp.task('watch', function(tag) { }); +/** + * clear all backend (fat free framework) cache files + */ +gulp.task('clearCache', function() { + 'use strict'; + return gulp.src( _src.CACHE ).pipe( clean() ); +}); + /*******************************************/ // Default Tasks diff --git a/js/app/map/map.js b/js/app/map/map.js index 5fb7f8078..dc5e09f2d 100644 --- a/js/app/map/map.js +++ b/js/app/map/map.js @@ -2019,7 +2019,6 @@ define([ }; system.singleDoubleClick(single, double); - }; /** diff --git a/public/js/v0.0.13/app.js b/public/js/v0.0.13/app.js deleted file mode 100644 index a19f6cdbc..000000000 --- a/public/js/v0.0.13/app.js +++ /dev/null @@ -1,2 +0,0 @@ -var mainScriptPath=document.body.getAttribute("data-script"),jsBaseUrl=document.body.getAttribute("data-js-path");requirejs.config({baseUrl:"js",paths:{layout:"layout",config:"app/config",dialog:"app/ui/dialog",templates:"../../templates",img:"../../img",landingpage:"./app/landingpage",mappage:"./app/mappage",jquery:"lib/jquery-1.11.3.min",bootstrap:"lib/bootstrap.min",text:"lib/requirejs/text",mustache:"lib/mustache.min",velocity:"lib/velocity.min",velocityUI:"lib/velocity.ui.min",slidebars:"lib/slidebars",jsPlumb:"lib/dom.jsPlumb-1.7.6-min",customScrollbar:"lib/jquery.mCustomScrollbar.concat.min",datatables:"lib/datatables/jquery.dataTables.min",datatablesResponsive:"lib/datatables/extensions/responsive/dataTables.responsive",datatablesTableTools:"lib/datatables/extensions/tabletools/js/dataTables.tableTools",xEditable:"lib/bootstrap-editable.min",morris:"lib/morris.min",raphael:"lib/raphael-min",bootbox:"lib/bootbox.min",easyPieChart:"lib/jquery.easypiechart.min",dragToSelect:"lib/jquery.dragToSelect",hoverIntent:"lib/jquery.hoverIntent.minified",fullScreen:"lib/jquery.fullscreen.min",select2:"lib/select2.min",validator:"lib/validator.min",lazylinepainter:"lib/jquery.lazylinepainter-1.5.1.min",blueImpGallery:"lib/blueimp-gallery",blueImpGalleryHelper:"lib/blueimp-helper",blueImpGalleryBootstrap:"lib/bootstrap-image-gallery",bootstrapConfirmation:"lib/bootstrap-confirmation",bootstrapToggle:"lib/bootstrap2-toggle.min",easePack:"lib/EasePack.min",tweenLite:"lib/TweenLite.min",pnotify:"lib/pnotify/pnotify.core","pnotify.buttons":"lib/pnotify/pnotify.buttons","pnotify.confirm":"lib/pnotify/pnotify.confirm","pnotify.nonblock":"lib/pnotify/pnotify.nonblock","pnotify.desktop":"lib/pnotify/pnotify.desktop","pnotify.history":"lib/pnotify/pnotify.history","pnotify.callbacks":"lib/pnotify/pnotify.callbacks","pnotify.reference":"lib/pnotify/pnotify.reference"},shim:{bootstrap:{deps:["jquery"]},velocity:{deps:["jquery"]},velocityUI:{deps:["velocity"]},slidebars:{deps:["jquery"]},customScrollbar:{deps:["jquery"]},datatables:{deps:["jquery"]},datatablesBootstrap:{deps:["datatables"]},datatablesResponsive:{deps:["datatables"]},datatablesTableTools:{deps:["datatables"]},xEditable:{deps:["bootstrap"]},bootbox:{deps:["jquery","bootstrap"],exports:"bootbox"},morris:{deps:["jquery","raphael"],exports:"Morris"},pnotify:{deps:["jquery"]},easyPieChart:{deps:["jquery"]},dragToSelect:{deps:["jquery"]},hoverIntent:{deps:["jquery"]},fullScreen:{deps:["jquery"]},select2:{deps:["jquery"],exports:"Select2"},validator:{deps:["jquery","bootstrap"]},lazylinepainter:{deps:["jquery","bootstrap"]},blueImpGallery:{deps:["jquery"]},bootstrapConfirmation:{deps:["bootstrap"]},bootstrapToggle:{deps:["jquery"]}}});require.config({baseUrl:jsBaseUrl});requirejs([mainScriptPath]); -//# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/public/js/v0.0.13/app.js.map b/public/js/v0.0.13/app.js.map deleted file mode 100644 index 30faa74d2..000000000 --- a/public/js/v0.0.13/app.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"app.js.map","sources":["app.js.src.js"],"names":["mainScriptPath","document","body","getAttribute","jsBaseUrl","requirejs","config","baseUrl","paths","layout","dialog","templates","img","landingpage","mappage","jquery","bootstrap","text","mustache","velocity","velocityUI","slidebars","jsPlumb","customScrollbar","datatables","datatablesResponsive","datatablesTableTools","xEditable","morris","raphael","bootbox","easyPieChart","dragToSelect","hoverIntent","fullScreen","select2","validator","lazylinepainter","blueImpGallery","blueImpGalleryHelper","blueImpGalleryBootstrap","bootstrapConfirmation","bootstrapToggle","easePack","tweenLite","pnotify","pnotify.buttons","pnotify.confirm","pnotify.nonblock","pnotify.desktop","pnotify.history","pnotify.callbacks","pnotify.reference","shim","deps","datatablesBootstrap","exports","require"],"mappings":"AACA,GAAIA,gBAAiBC,SAASC,KAAKC,aAAa,eAI5CC,UAAYH,SAASC,KAAKC,aAAa,eAG3CE,WAAUC,QACNC,QAAS,KAETC,OACIC,OAAQ,SACRH,OAAQ,aACRI,OAAQ,gBACRC,UAAW,kBACXC,IAAK,YAGLC,YAAa,oBACbC,QAAS,gBAETC,OAAQ,wBACRC,UAAW,oBACXC,KAAM,qBACNC,SAAU,mBACVC,SAAU,mBACVC,WAAY,sBACZC,UAAW,gBACXC,QAAS,4BACTC,gBAAiB,yCACjBC,WAAY,uCAEZC,qBAAsB,6DAEtBC,qBAAsB,gEACtBC,UAAW,6BACXC,OAAQ,iBACRC,QAAS,kBACTC,QAAS,kBACTC,aAAc,8BACdC,aAAc,0BACdC,YAAa,kCACbC,WAAY,4BACZC,QAAS,kBACTC,UAAW,oBACXC,gBAAiB,uCACjBC,eAAgB,sBAChBC,qBAAsB,qBACtBC,wBAAyB,8BACzBC,sBAAuB,6BACvBC,gBAAiB,4BAGjBC,SAAU,mBACVC,UAAW,oBAGXC,QAAS,2BACTC,kBAAmB,8BACnBC,kBAAmB,8BACnBC,mBAAoB,+BACpBC,kBAAmB,8BACnBC,kBAAmB,8BACnBC,oBAAqB,gCACrBC,oBAAqB,iCAGzBC,MACIrC,WACIsC,MAAO,WAEXnC,UACImC,MAAO,WAEXlC,YACIkC,MAAO,aAEXjC,WACIiC,MAAO,WAEX/B,iBACI+B,MAAO,WAEX9B,YACI8B,MAAO,WAEXC,qBACID,MAAO,eAEX7B,sBACI6B,MAAO,eAEX5B,sBACI4B,MAAO,eAEX3B,WACI2B,MAAO,cAEXxB,SACIwB,MAAO,SAAU,aACjBE,QAAS,WAEb5B,QACI0B,MAAO,SAAU,WACjBE,QAAS,UAEbX,SACIS,MAAQ,WAEZvB,cACIuB,MAAQ,WAEZtB,cACIsB,MAAQ,WAEZrB,aACIqB,MAAQ,WAEZpB,YACIoB,MAAQ,WAEZnB,SACImB,MAAQ,UACRE,QAAS,WAEbpB,WACIkB,MAAQ,SAAU,cAEtBjB,iBACIiB,MAAQ,SAAU,cAEtBhB,gBACIgB,MAAQ,WAEZb,uBACIa,MAAQ,cAEZZ,iBACIY,MAAQ,aAQpBG,SAAQnD,QACJC,QAASH,WAIbC,YAAYL"} \ No newline at end of file diff --git a/public/js/v0.0.13/app.js.src.js b/public/js/v0.0.13/app.js.src.js deleted file mode 100644 index b60bef4bb..000000000 --- a/public/js/v0.0.13/app.js.src.js +++ /dev/null @@ -1,153 +0,0 @@ -// main script path -var mainScriptPath = document.body.getAttribute('data-script'); - -// js baseURL. Depends on the environment. -// e.g. use raw files (develop) or build files (production) -var jsBaseUrl = document.body.getAttribute('data-js-path'); - -// requireJs configuration -requirejs.config({ - baseUrl: 'js', // path for baseUrl - dynamically set !below! ("build_js" | "js") - - paths: { - layout: 'layout', - config: 'app/config', // path for "configuration" files dir - dialog: 'app/ui/dialog', // path for "dialog" files dir - templates: '../../templates', // template dir - img: '../../img', // images dir - - // main views - landingpage: './app/landingpage', // initial start "landing page" view - mappage: './app/mappage', // initial start "map page" view - - jquery: 'lib/jquery-1.11.3.min', // v1.11.3 jQuery - bootstrap: 'lib/bootstrap.min', // v3.3.0 Bootstrap js code - http://getbootstrap.com/javascript/ - text: 'lib/requirejs/text', // v2.0.12 A RequireJS/AMD loader plugin for loading text resources. - mustache: 'lib/mustache.min', // v1.0.0 Javascript template engine - http://mustache.github.io/ - velocity: 'lib/velocity.min', // v1.2.2 animation engine - http://julian.com/research/velocity/ - velocityUI: 'lib/velocity.ui.min', // v5.0.4 plugin for velocity - http://julian.com/research/velocity/#uiPack - slidebars: 'lib/slidebars', // v0.10 Slidebars - side menu plugin http://plugins.adchsm.me/slidebars/ - jsPlumb: 'lib/dom.jsPlumb-1.7.6-min', // v1.7.6 jsPlumb (Vanilla)- main map draw plugin https://jsplumbtoolkit.com/ - customScrollbar: 'lib/jquery.mCustomScrollbar.concat.min', // v3.0.9 Custom scroll bars - http://manos.malihu.gr/ - datatables: 'lib/datatables/jquery.dataTables.min', // v1.10.7 DataTables - https://datatables.net/ - //datatablesBootstrap: 'lib/datatables/dataTables.bootstrap', // DataTables - not used (bootstrap style) - datatablesResponsive: 'lib/datatables/extensions/responsive/dataTables.responsive', // v1.0.6 TableTools (PlugIn) - https://datatables.net/extensions/responsive/ - - datatablesTableTools: 'lib/datatables/extensions/tabletools/js/dataTables.tableTools', // v2.2.3 TableTools (PlugIn) - https://datatables.net/extensions/tabletools/ - xEditable: 'lib/bootstrap-editable.min', // v1.5.1 X-editable - in placed editing - morris: 'lib/morris.min', // v0.5.1 Morris.js - graphs and charts - raphael: 'lib/raphael-min', // v2.1.2 Raphaël - required for morris (dependency) - bootbox: 'lib/bootbox.min', // v4.3.0 Bootbox.js - custom dialogs - easyPieChart: 'lib/jquery.easypiechart.min', // v2.1.6 Easy Pie Chart - HTML 5 pie charts - http://rendro.github.io/easy-pie-chart/ - dragToSelect: 'lib/jquery.dragToSelect', // v1.1 Drag to Select - http://andreaslagerkvist.com/jquery/drag-to-select/ - hoverIntent: 'lib/jquery.hoverIntent.minified', // v1.8.0 Hover intention - http://cherne.net/brian/resources/jquery.hoverIntent.html - fullScreen: 'lib/jquery.fullscreen.min', // v0.5.0 Full screen mode - https://github.com/private-face/jquery.fullscreen - select2: 'lib/select2.min', // v4.0.0 Drop Down customization - https://select2.github.io/ - validator: 'lib/validator.min', // v0.7.2 Validator for Bootstrap 3 - https://github.com/1000hz/bootstrap-validator - lazylinepainter: 'lib/jquery.lazylinepainter-1.5.1.min', // v1.5.1 SVG line animation plugin - http://lazylinepainter.info/ - blueImpGallery: 'lib/blueimp-gallery', // v2.15.2 Image Gallery - https://github.com/blueimp/Gallery/ - blueImpGalleryHelper: 'lib/blueimp-helper', // helper function for Blue Imp Gallery - blueImpGalleryBootstrap: 'lib/bootstrap-image-gallery', // v3.1.1 Bootstrap extension for Blue Imp Gallery - https://blueimp.github.io/Bootstrap-Image-Gallery/ - bootstrapConfirmation: 'lib/bootstrap-confirmation', // v1.0.1 Bootstrap extension for inline confirm dialog - https://github.com/tavicu/bs-confirmation - bootstrapToggle: 'lib/bootstrap2-toggle.min', // v2.2.0 Bootstrap Toggle (Checkbox) - http://www.bootstraptoggle.com/ - - // header animation - easePack: 'lib/EasePack.min', - tweenLite: 'lib/TweenLite.min', - - // notification plugin - pnotify: 'lib/pnotify/pnotify.core', // v2.0.1 PNotify - notification core file - 'pnotify.buttons': 'lib/pnotify/pnotify.buttons', // PNotify - buttons notification extension - 'pnotify.confirm': 'lib/pnotify/pnotify.confirm', // PNotify - confirmation notification extension - 'pnotify.nonblock': 'lib/pnotify/pnotify.nonblock', // PNotify - notification non-block extension (hover effect) - 'pnotify.desktop': 'lib/pnotify/pnotify.desktop', // PNotify - desktop push notification extension - 'pnotify.history': 'lib/pnotify/pnotify.history', // PNotify - history push notification history extension - 'pnotify.callbacks': 'lib/pnotify/pnotify.callbacks', // PNotify - callbacks push notification extension - 'pnotify.reference': 'lib/pnotify/pnotify.reference' // PNotify - reference push notification extension - - }, - shim: { - bootstrap: { - deps: ['jquery'] - }, - velocity: { - deps: ['jquery'] - }, - velocityUI: { - deps: ['velocity'] - }, - slidebars: { - deps: ['jquery'] - }, - customScrollbar: { - deps: ['jquery'] - }, - datatables: { - deps: ['jquery'] - }, - datatablesBootstrap: { - deps: ['datatables'] - }, - datatablesResponsive: { - deps: ['datatables'] - }, - datatablesTableTools: { - deps: ['datatables'] - }, - xEditable: { - deps: ['bootstrap'] - }, - bootbox: { - deps: ['jquery', 'bootstrap'], - exports: 'bootbox' - }, - morris: { - deps: ['jquery', 'raphael'], - exports: 'Morris' - }, - pnotify: { - deps : ['jquery'] - }, - easyPieChart: { - deps : ['jquery'] - }, - dragToSelect: { - deps : ['jquery'] - }, - hoverIntent: { - deps : ['jquery'] - }, - fullScreen: { - deps : ['jquery'] - }, - select2: { - deps : ['jquery'], - exports: 'Select2' - }, - validator: { - deps : ['jquery', 'bootstrap'] - }, - lazylinepainter: { - deps : ['jquery', 'bootstrap'] - }, - blueImpGallery: { - deps : ['jquery'] - }, - bootstrapConfirmation: { - deps : ['bootstrap'] - }, - bootstrapToggle: { - deps : ['jquery'] - } - } -}); - -// switch baseUrl to js "build_js" in production environment -// this has no effect for js build process! -// check build.js for build configuration -require.config({ - baseUrl: jsBaseUrl -}); - -// load the main app module -> initial app start -requirejs( [mainScriptPath] ); diff --git a/public/js/v0.0.13/app/landingpage.js b/public/js/v0.0.13/app/landingpage.js deleted file mode 100644 index de44f9bb4..000000000 --- a/public/js/v0.0.13/app/landingpage.js +++ /dev/null @@ -1,15 +0,0 @@ -!function(t,e){"object"==typeof module&&"object"==typeof module.exports?module.exports=t.document?e(t,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return e(t)}:e(t)}("undefined"!=typeof window?window:this,function(t,e){function i(t){var e="length"in t&&t.length,i=at.type(t);return"function"===i||at.isWindow(t)?!1:1===t.nodeType&&e?!0:"array"===i||0===e||"number"==typeof e&&e>0&&e-1 in t}function n(t,e,i){if(at.isFunction(e))return at.grep(t,function(t,n){return!!e.call(t,n,t)!==i});if(e.nodeType)return at.grep(t,function(t){return t===e!==i});if("string"==typeof e){if(pt.test(e))return at.filter(e,t,i);e=at.filter(e,t)}return at.grep(t,function(t){return at.inArray(t,e)>=0!==i})}function a(t,e){do t=t[e];while(t&&1!==t.nodeType);return t}function o(t){var e=wt[t]={};return at.each(t.match(bt)||[],function(t,i){e[i]=!0}),e}function s(){ft.addEventListener?(ft.removeEventListener("DOMContentLoaded",r,!1),t.removeEventListener("load",r,!1)):(ft.detachEvent("onreadystatechange",r),t.detachEvent("onload",r))}function r(){(ft.addEventListener||"load"===event.type||"complete"===ft.readyState)&&(s(),at.ready())}function l(t,e,i){if(void 0===i&&1===t.nodeType){var n="data-"+e.replace(_t,"-$1").toLowerCase();if(i=t.getAttribute(n),"string"==typeof i){try{i="true"===i?!0:"false"===i?!1:"null"===i?null:+i+""===i?+i:Tt.test(i)?at.parseJSON(i):i}catch(a){}at.data(t,e,i)}else i=void 0}return i}function c(t){var e;for(e in t)if(("data"!==e||!at.isEmptyObject(t[e]))&&"toJSON"!==e)return!1;return!0}function u(t,e,i,n){if(at.acceptData(t)){var a,o,s=at.expando,r=t.nodeType,l=r?at.cache:t,c=r?t[s]:t[s]&&s;if(c&&l[c]&&(n||l[c].data)||void 0!==i||"string"!=typeof e)return c||(c=r?t[s]=X.pop()||at.guid++:s),l[c]||(l[c]=r?{}:{toJSON:at.noop}),("object"==typeof e||"function"==typeof e)&&(n?l[c]=at.extend(l[c],e):l[c].data=at.extend(l[c].data,e)),o=l[c],n||(o.data||(o.data={}),o=o.data),void 0!==i&&(o[at.camelCase(e)]=i),"string"==typeof e?(a=o[e],null==a&&(a=o[at.camelCase(e)])):a=o,a}}function d(t,e,i){if(at.acceptData(t)){var n,a,o=t.nodeType,s=o?at.cache:t,r=o?t[at.expando]:at.expando;if(s[r]){if(e&&(n=i?s[r]:s[r].data)){at.isArray(e)?e=e.concat(at.map(e,at.camelCase)):e in n?e=[e]:(e=at.camelCase(e),e=e in n?[e]:e.split(" ")),a=e.length;for(;a--;)delete n[e[a]];if(i?!c(n):!at.isEmptyObject(n))return}(i||(delete s[r].data,c(s[r])))&&(o?at.cleanData([t],!0):it.deleteExpando||s!=s.window?delete s[r]:s[r]=null)}}}function p(){return!0}function h(){return!1}function f(){try{return ft.activeElement}catch(t){}}function m(t){var e=Lt.split("|"),i=t.createDocumentFragment();if(i.createElement)for(;e.length;)i.createElement(e.pop());return i}function g(t,e){var i,n,a=0,o=typeof t.getElementsByTagName!==St?t.getElementsByTagName(e||"*"):typeof t.querySelectorAll!==St?t.querySelectorAll(e||"*"):void 0;if(!o)for(o=[],i=t.childNodes||t;null!=(n=i[a]);a++)!e||at.nodeName(n,e)?o.push(n):at.merge(o,g(n,e));return void 0===e||e&&at.nodeName(t,e)?at.merge([t],o):o}function v(t){It.test(t.type)&&(t.defaultChecked=t.checked)}function y(t,e){return at.nodeName(t,"table")&&at.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function b(t){return t.type=(null!==at.find.attr(t,"type"))+"/"+t.type,t}function w(t){var e=Yt.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function C(t,e){for(var i,n=0;null!=(i=t[n]);n++)at._data(i,"globalEval",!e||at._data(e[n],"globalEval"))}function x(t,e){if(1===e.nodeType&&at.hasData(t)){var i,n,a,o=at._data(t),s=at._data(e,o),r=o.events;if(r){delete s.handle,s.events={};for(i in r)for(n=0,a=r[i].length;a>n;n++)at.event.add(e,i,r[i][n])}s.data&&(s.data=at.extend({},s.data))}}function S(t,e){var i,n,a;if(1===e.nodeType){if(i=e.nodeName.toLowerCase(),!it.noCloneEvent&&e[at.expando]){a=at._data(e);for(n in a.events)at.removeEvent(e,n,a.handle);e.removeAttribute(at.expando)}"script"===i&&e.text!==t.text?(b(e).text=t.text,w(e)):"object"===i?(e.parentNode&&(e.outerHTML=t.outerHTML),it.html5Clone&&t.innerHTML&&!at.trim(e.innerHTML)&&(e.innerHTML=t.innerHTML)):"input"===i&&It.test(t.type)?(e.defaultChecked=e.checked=t.checked,e.value!==t.value&&(e.value=t.value)):"option"===i?e.defaultSelected=e.selected=t.defaultSelected:("input"===i||"textarea"===i)&&(e.defaultValue=t.defaultValue)}}function T(e,i){var n,a=at(i.createElement(e)).appendTo(i.body),o=t.getDefaultComputedStyle&&(n=t.getDefaultComputedStyle(a[0]))?n.display:at.css(a[0],"display");return a.detach(),o}function _(t){var e=ft,i=Jt[t];return i||(i=T(t,e),"none"!==i&&i||(Zt=(Zt||at("