Skip to content

Commit

Permalink
Merge pull request #29 from dolkensp/feature/ship-updates
Browse files Browse the repository at this point in the history 
Add support for:
  • Loading branch information
@peter-dolkens
peter-dolkens authored Oct 20, 2018
2 parents f452d28 + 41457da commit 78e6343
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# general configuration #
#---------------------------------#

version: 3.2.{build}
version: 3.3.{build}

#---------------------------------#
# environment configuration #
Expand Down
3 changes: 2 additions & 1 deletion src/web_resources/HangarXPLOR.ProcessItem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ HangarXPLOR.ProcessItem = function()
this.shipName = this.shipName.replace('Origin 600i Exploration Module', 'Origin 600i');
this.shipName = this.shipName.replace('M50 Interceptor', 'M50');
this.shipName = this.shipName.replace('M50', 'M50 Interceptor');
this.shipName = this.shipName.replace('Hornet F7C', 'F7C Hornet');

this.meltValue = parseFloat(this.pledgeValue.replace("$", "").replace(",", "").replace(" USD", ""));
if (this.meltValue != this.meltValue) this.meltValue = 0; // NaN safety
Expand All @@ -156,7 +157,7 @@ HangarXPLOR.ProcessItem = function()
this.isFlair = $('.kind:contains(Hangar decoration)', this).length > 0;
this.isDecoration = !this.isModel && !this.isPoster && this.isFlair && !this.isFishtank &&!this.isPlant;
this.isComponent = $('.kind:contains(Component)', this).length > 0;
this.isWarbond = this.originalName.toLowerCase().indexOf('warbond') > -1;
this.isWarbond = this.originalName.toLowerCase().indexOf('warbond') > -1 || this.originalName.toLowerCase().indexOf(' wb') > -1;
this.isSelected = false;

HangarXPLOR._shipCount += $ship.length;
Expand Down
2 changes: 1 addition & 1 deletion src/web_resources/HangarXPLOR.SearchBox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HangarXPLOR.SearchBox = function()
HangarXPLOR.Log('Rendering SearchBox');

const $searchBox = $('<input>', { id: 'searchInput', class: 'js-custom-search', placeholder: 'Search' });
const $searchBoxMirror = $('<input>', { class: 'js-custom-search-complete', disabled: "disabled" });
const $searchBoxMirror = $('<input>', { class: 'js-custom-search-complete', disabled: 'disabled' });

$searchBox.keyup(function() {
HangarXPLOR.Render();
Expand Down
29 changes: 26 additions & 3 deletions src/web_resources/HangarXPLOR.Ships.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var HangarXPLOR = HangarXPLOR || {};

HangarXPLOR._ships = [
{ 'name': 'Origin 100 Series Pack', 'thumbnail': '/media/jhifpuskfsm4gr/heap_infobox/Origin_100_All_100s_LineUP_Front_sm-Min.jpg' },
{ 'name': '100i', 'thumbnail': '/media/bapnpk9usqxxhr/heap_infobox/100i.jpg' },
{ 'name': '125a', 'thumbnail': '/media/vkuyeedcipouyr/heap_infobox/125a.jpg' },
{ 'name': '135c', 'thumbnail': '/media/j6gp10aglbb0or/heap_infobox/135c.jpg' },
Expand All @@ -14,32 +15,41 @@ HangarXPLOR._ships = [
{ 'name': '600i', 'thumbnail': '/media/8sqwytgh6ij03r/heap_infobox/600i-Exploration.jpg' },
{ 'name': '85X', 'thumbnail': '/media/4vht65hve2o1cr/heap_infobox/85_X_city_shot.jpg' },
{ 'name': '890 JUMP', 'thumbnail': '/media/aokcb6ay0i0jpr/heap_infobox/890_beautyShot-Concept_V01High_NF_140709.jpg' },
{ 'name': 'Apollo Triage', 'thumbnail': '/media/rb5f1w3fwj91qr/heap_infobox/RSI_Apollo_landed_topview_03_AL_Pj01-Squashed.jpg' },
{ 'name': 'Apollo', 'thumbnail': '/media/qtbgmjijc8g1vr/heap_infobox/RSI_Apollo_Promo_Recovery_Drone_AL01_PJ01-Squashed.jpg' },
{ 'name': 'Aurora CL', 'thumbnail': '/media/fh1gtu93mndsur/heap_infobox/Rsi_aurora_cl_storefront_visual.jpg' },
{ 'name': 'Aurora ES', 'thumbnail': '/media/9u8061zhf29fir/heap_infobox/Rsi_aurora_es_storefront_visual.jpg' },
{ 'name': 'Aurora LN', 'thumbnail': '/media/ljgowkr9tdwetr/heap_infobox/Rsi_aurora_ln_storefront_visual.jpg' },
{ 'name': 'Aurora LX', 'thumbnail': '/media/xfq27owiysn6ar/heap_infobox/Aurora-LX_Ortho.jpg' },
{ 'name': 'Aurora MR', 'thumbnail': '/media/ohbfgn1ebcsnar/heap_infobox/Rsi_aurora_mr_storefront_visual.jpg' },
{ 'name': 'Aurora', 'thumbnail': '/media/9u8061zhf29fir/heap_infobox/Rsi_aurora_es_storefront_visual.jpg' },
{ 'name': 'Avenger Stalker', 'thumbnail': '/media/3dx8jqsd79dmpr/heap_infobox/Avenger_storefront_visualjpg.jpg' },
{ 'name': 'Avenger Titan Renegade', 'thumbnail': '/media/cg2gcecohj7s6r/heap_infobox/Avenger_cargo_right.jpg' },
{ 'name': 'Avenger Titan', 'thumbnail': '/media/cg2gcecohj7s6r/heap_infobox/Avenger_cargo_right.jpg' },
{ 'name': 'Avenger Warlock', 'thumbnail': '/media/qcv2n7ms9qwj8r/heap_infobox/Avenger_EMP_02.jpg' },
{ 'name': 'Avenger', 'thumbnail': '/media/3dx8jqsd79dmpr/heap_infobox/Avenger_storefront_visualjpg.jpg' },
{ 'name': 'Buccaneer', 'thumbnail': '/media/pz2oqi319v0ptr/heap_infobox/Buccaneer_Landed_02.jpg' },
{ 'name': 'Blade', 'thumbnail': '/media/nlamsjvlrdywnr/heap_infobox/Blade-Top-Squashed.jpg' },
{ 'name': 'Carrack', 'thumbnail': '/media/u248nf7opb5bhr/heap_infobox/Carrack_Landed_Final_Gurmukh.png' },
{ 'name': 'Caterpillar', 'thumbnail': '/media/t6jowqxe2u8jxr/heap_infobox/Ext-Front-V01.jpg' },
{ 'name': 'Caterpillar Pirate Edition', 'thumbnail': '/media/56cjes33yzdj6r/heap_infobox/Pirate_05.jpg' },
{ 'name': 'Constellation Andromeda', 'thumbnail': '/media/vzyhde6cjgsn7r/heap_infobox/Andromeda_Storefront.jpg' },
{ 'name': 'Constellation Aquila', 'thumbnail': '/media/u0pbc9k058nuhr/heap_infobox/Aquila_Storefront.jpg' },
{ 'name': 'Constellation Phoenix', 'thumbnail': '/media/0o9gi8gbsm178r/heap_infobox/Phoenix_Storefront.jpg' },
{ 'name': 'Constellation Phoenix Emerald', 'thumbnail': '/media/kkakjxny421xfr/heap_infobox/Connie_Emerald.jpg' },
{ 'name': 'Constellation Phoenix', 'thumbnail': 'https://media.robertsspaceindustries.com/mibl3d305r0q6/heap_infobox.png' },
{ 'name': 'Constellation Taurus', 'thumbnail': '/media/3vj4o4l5uggk7r/heap_infobox/Taurus-Storefront.jpg' },
{ 'name': 'Constellation', 'thumbnail': '/media/3vj4o4l5uggk7r/heap_infobox/Taurus-Storefront.jpg' },
{ 'name': 'Crucible', 'thumbnail': '/media/p1ssz5xc0ev53r/heap_infobox/AnvilcrucibleLANDED.jpg' },
{ 'name': 'Cutlass Black', 'thumbnail': '/media/7tcxllnna6a9hr/heap_infobox/Drake_cutlass_storefront_visual.jpg' },
{ 'name': 'Cutlass Blue', 'thumbnail': '/media/8d5ywktt23231r/heap_infobox/Blue-WR-Orth_000000.jpg' },
{ 'name': 'Cutlass Red', 'thumbnail': '/media/anznazc3gf5oar/heap_infobox/Slide_Cut-Red.jpg' },
{ 'name': 'Cutlass', 'thumbnail': '/media/7tcxllnna6a9hr/heap_infobox/Drake_cutlass_storefront_visual.jpg' },
{ 'name': 'Cyclone-AA', 'thumbnail': '/media/wk9v710a3544zr/heap_infobox/03_AA_Cyclone-1.jpg' },
{ 'name': 'Cyclone-RC', 'thumbnail': '/media/jq8ph9r2m9dtbr/heap_infobox/05_RC_Cyclone-1.jpg' },
{ 'name': 'Cyclone-RN', 'thumbnail': '/media/uwsxls7k000byr/heap_infobox/06_RN_Cyclone.jpg' },
{ 'name': 'Cyclone-TR', 'thumbnail': '/media/bt0t220cao82ur/heap_infobox/00_TR_Cyclone.jpg' },
// { 'name': 'Cyclone', 'thumbnail': '/media/bt0t220cao82ur/heap_infobox/00_TR_Cyclone.jpg' },
{ 'name': 'Defender', 'thumbnail': '/media/hh9wc0m0r6y5nr/heap_infobox/20170407c-reduced.jpg' },
{ 'name': 'Drake Buccaneer', 'thumbnail': '/media/eiua12z9nxlkar/heap_infobox/Buc_final120_compFlat.jpg' },
{ 'name': 'Eclipse', 'thumbnail': '/media/uqceivqlombzor/heap_infobox/Aegis-Eclipse-L4-Piece-2-Hangar-Presentation-007.jpg' },
{ 'name': 'Endeavor', 'thumbnail': '/media/vh2jbjaom7ys4r/heap_infobox/CO_Beauty_BioDomes.jpg' },
{ 'name': 'F7C-M Super Hornet', 'thumbnail': '/media/4otqgybm0y38ur/heap_infobox/F7c-M_super-Hornet_storefront_visual.jpg' },
Expand All @@ -59,6 +69,9 @@ HangarXPLOR._ships = [
{ 'name': 'Hammerhead', 'thumbnail': '/media/o3629jnxrq3bmr/heap_infobox/Hammerhead_Missile_Fire_2.jpg' },
{ 'name': 'Hawk', 'thumbnail': '/media/4diiopxx6gyr5r/heap_infobox/Ah-Parking-Scene-02.jpg' },
{ 'name': 'Herald', 'thumbnail': '/media/rq2gv7b4b3id0r/heap_infobox/Herald-1.jpg' },
{ 'name': 'Hercules Starlifter A2', 'thumbnail': '/media/kct1e9vkx4ld6r/heap_infobox/CRUS_Starlifter_Promo_Gunship_Bombing_MO02-Squashed.jpg' },
{ 'name': 'Hercules Starlifter C2', 'thumbnail': '/media/7bdt759toqnvhr/heap_infobox/CRUS_Starlifter_Promo_Basic_Landed_MO01-Squashed.jpg' },
{ 'name': 'Hercules Starlifter M2', 'thumbnail': '/media/p077b9nm14i11r/heap_infobox/CRUS_Starlifter_Promo_Military_Flares_MO01-Squashed.jpg' },
{ 'name': 'Hornet F7C', 'thumbnail': '/media/m6e374a9zb7dlr/heap_infobox/F7c_hornet_storefront_visual.jpg' },
{ 'name': 'Hull A', 'thumbnail': '/media/tpw5r365mowmar/heap_infobox/Hull_A_Final.jpg' },
{ 'name': 'Hull B', 'thumbnail': '/media/xg8d8kyo0bjsmr/heap_infobox/HullB_landedcompv3b.jpg' },
Expand All @@ -69,12 +82,16 @@ HangarXPLOR._ships = [
{ 'name': 'Idris-M', 'thumbnail': '/media/rfjjekm57en5jr/heap_infobox/IDRISdownfrontquarter_copy.jpg' },
{ 'name': 'Idris-P', 'thumbnail': '/media/okj4yh84jq9f2r/heap_infobox/IDRISuprearquarter-Copy.jpg' }, // /media/rfjjekm57en5jr/heap_infobox/IDRISdownfrontquarter_copy.jpg' },
{ 'name': 'Javelin-Class Destroyer', 'thumbnail': '/media/nzqi87nkarvupr/heap_infobox/Javelin-Sale.jpg' },
{ 'name': 'Kraken', 'thumbnail': 'https://media.robertsspaceindustries.com/vz94xqyun7q6q/heap_infobox.jpg' },
{ 'name': 'Khartu-Al', 'thumbnail': '/media/zzycyqkpn9vu8r/heap_infobox/Image_landed.jpg' },
{ 'name': 'Lightning', 'thumbnail': '/media/vdwks9gq7ch8pr/heap_infobox/Sq42_SneakPeekF8.png' },
{ 'name': 'M50', 'thumbnail': '/media/q1jk89gqz2231r/heap_infobox/Jumppoint-Final-Crop.jpg' },
{ 'name': 'Merchantman', 'thumbnail': '/media/d8ktckex1ucmrr/heap_infobox/Banu3.jpg' }, // /media/63lxivb7mi3vzr/heap_infobox/Banu_merchantman_side_Version_A.jpg
{ 'name': 'Mercury', 'thumbnail': '/media/irj2hkopf9043r/heap_infobox/Crusader3-Min.jpeg' },
{ 'name': 'MPUV Cargo', 'thumbnail': '/media/czio0bw0x1v6cr/heap_infobox/BatCave_4k_v02right2.jpg' },
{ 'name': 'MPUV Personnel', 'thumbnail': '/media/fgi7cen4bdvzkr/heap_infobox/Landing_v01.jpg' },
{ 'name': 'Mustang Alpha', 'thumbnail': '/media/ssh2spko70pz6r/heap_infobox/Alpha-Front.jpg' },
{ 'name': 'Mustang Alpha Vindicator', 'thumbnail': '/iohmvf24h4rsz/heap_infobox.png' },
{ 'name': 'Mustang Beta', 'thumbnail': '/media/ltw03c5rli6uwr/heap_infobox/Beta-Front.jpg' },
{ 'name': 'Mustang Delta', 'thumbnail': '/media/dtqy8jpl0f9cbr/heap_infobox/Delta-Front.jpg' },
{ 'name': 'Mustang Gamma', 'thumbnail': '/media/yu4cuzh90oz54r/heap_infobox/Gamma-Front.jpg' },
Expand All @@ -83,14 +100,16 @@ HangarXPLOR._ships = [
{ 'name': 'Nox Kue', 'thumbnail': '/media/z676k3irx41iur/heap_infobox/NoxKue-Left.jpg' },
{ 'name': 'Nox', 'thumbnail': '/media/3y2kl543u5n4qr/heap_infobox/Nox-Left.jpg' },
{ 'name': 'Orion', 'thumbnail': '/media/hfpnkupg7gr6er/heap_infobox/RSI_Orion_Situ1b_150219_GH.jpg' },
{ 'name': 'Origin 100 Series Pack', 'thumbnail': '/media/jhifpuskfsm4gr/heap_infobox/Origin_100_All_100s_LineUP_Front_sm-Min.jpg' },
{ 'name': 'P-52 Merlin', 'thumbnail': '/media/a9231ysz5cnvor/heap_infobox/Top.jpg' },
{ 'name': 'P-72 Archimedes', 'thumbnail': '/media/xqgbgw3x6o54ir/heap_infobox/Archimedes_Front_01.jpg' },
{ 'name': 'Razor', 'thumbnail': '/media/18235dq8cydhur/heap_infobox/Misc-Razer-Murray-Ringz-Paint-V5.jpg' },
{ 'name': 'Pioneer', 'thumbnail': '/media/of1es6gu4pa4ir/heap_infobox/Alderin-Landed-Snow-Shot.jpg' },
{ 'name': 'Polaris', 'thumbnail': '/media/jv2ayxfguiu57r/heap_infobox/Polaris-Landed.jpg' },
{ 'name': 'Prospector', 'thumbnail': '/media/smfwnj15y4gq5r/heap_infobox/MISC-Mining-Vehicle-PIECE-2-V19.jpg' },
{ 'name': 'Prowler', 'thumbnail': '/media/3j9cau4jygwier/heap_infobox/Esperia_Prowler_SHOT_01b.jpg' },
{ 'name': 'Razor EX', 'thumbnail': '/media/dnlz9p3jx9ll7r/heap_infobox/2-Razor-Flight-Squashed.jpg' },
{ 'name': 'Razor LX', 'thumbnail': '/media/q9uluuv7z01y7r/heap_infobox/3-LX-City-Flight-Squashed.jpg' },
{ 'name': 'Razor', 'thumbnail': '/media/18235dq8cydhur/heap_infobox/Misc-Razer-Murray-Ringz-Paint-V5.jpg' }, // '/media/ignbfgsun0k0hr/heap_infobox/Misc-Razer-Pit-Crew-V4.jpg' },
{ 'name': 'Reclaimer', 'thumbnail': '/media/627hob4lwqt3xr/heap_infobox/Image002-1.jpg' },
{ 'name': 'Redeemer', 'thumbnail': '/media/t0opqw0tauo45r/heap_infobox/Red1.jpg' },
{ 'name': 'Reliant Kore - Mini Hauler', 'thumbnail': '/media/rh3sstehu678br/heap_infobox/Reliant_Kore_01.jpg' },
Expand All @@ -108,13 +127,17 @@ HangarXPLOR._ships = [
{ 'name': 'Starfarer', 'thumbnail': '/media/k4f44vqnex0m1r/heap_infobox/SF-Chris-O-2.jpg' },
{ 'name': 'Starfarer Gemini', 'thumbnail': '/media/4pgpl7n71hijzr/heap_infobox/Gemini2338.jpg' },
{ 'name': 'Terrapin', 'thumbnail': '/media/lbhilnq9i8t2mr/heap_infobox/Anvil_Terrapin_Piece_03_Surveilance_v3.jpg' },
{ 'name': 'Valkyrie Liberator', 'thumbnail': '/media/l87lynolh4pxyr/heap_infobox/128934g7tt.jpg' },
{ 'name': 'Valkyrie', 'thumbnail': '/media/k4wwe7c9j342qr/heap_infobox/Hhui677dl-Min.jpg' },
// https://robertsspaceindustries.com/media/2fsa0bb3f4e19r/heap_infobox/Valkyrie-Blue-Formation.png
{ 'name': 'Vanduul Blade', 'thumbnail': '/media/d63g0lqsljoyfr/heap_infobox/01.jpg' },
{ 'name': 'Vanguard Hoplite', 'thumbnail': '/media/zwyyyap3aa7wwr/heap_infobox/Aegis_Vanguard_Hoplite_01.jpg' },
{ 'name': 'Vanguard Harbinger', 'thumbnail': '/media/c5vioobscp9vkr/heap_infobox/02.jpg' },
{ 'name': 'Vanguard Sentinel', 'thumbnail': '/media/qqmzhgb7ra29xr/heap_infobox/03.jpg' },
{ 'name': 'Vanguard Warden', 'thumbnail': '/media/4bnuwyj849f3hr/heap_infobox/Vanguard_34_final_Bachiller_02.png' },
{ 'name': 'Vanguard', 'thumbnail': '/media/4bnuwyj849f3hr/heap_infobox/Vanguard_34_final_Bachiller_02.png' },
{ 'name': 'Vulcan', 'thumbnail': '/media/shj3bowjd33umr/heap_infobox/AEGS_Vulcan_ToTheRescueFinal_001b.jpg' },
{ 'name': 'Vulture', 'thumbnail': '/media/me9lsb0sr41kzr/heap_infobox/Vulture_mechanic.jpg' },
{ 'name': 'Xi\'an Scout', 'thumbnail': '/media/zzycyqkpn9vu8r/heap_infobox/Image_landed.jpg' },
{ 'name': 'X1 Baseline Scarlet Edition', 'thumbnail': '/media/3yoh7gun89r8ir/heap_infobox/X1_red_lmt_edition_skin.png' },
{ 'name': 'X1 Velocity', 'thumbnail': '/media/db18k7yq7s9x0r/heap_infobox/X1_racing_skin.png' },
Expand Down
2 changes: 1 addition & 1 deletion src/web_resources/HangarXPLOR.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
.js-bulk-ui .loading .value { display: none; }
.js-bulk-ui .loading .status { display: block; }

.js-custom-controls .js-custom-search-wrapper { position: relative; margin: -10px 0px 0px 10px; padding: 0 0 5px; height: 35px !important; }
.js-custom-controls .controls.js-custom-search-wrapper { position: relative; margin: -10px 0px 0px 10px; padding: 0 0 5px; height: 35px !important; }
.js-custom-controls .js-custom-search,
.js-custom-controls .js-custom-search-complete { border: 1px solid rgba(22, 42, 63, 0.8); font-size: 12px; color: #355e78; width: 100%; padding: 10px 15px; display: block; -moz-box-sizing: border-box; box-sizing: border-box; -webkit-transition: all 0.2s !important; -moz-transition: all 0.2s !important; -o-transition: all 0.2s !important; -ms-transition: all 0.2s !important; transition: all 0.2s !important; position: absolute; top: 0; left: 0; z-index: 11; background: transparent; }
.js-custom-controls .js-custom-search { color: #387893; }
Expand Down

0 comments on commit 78e6343

Please sign in to comment.