From f72c8f33ec9cdff553082ac9fd1e8c59581dc266 Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Thu, 28 Mar 2013 19:04:01 -0700 Subject: [PATCH 1/6] Added Gem to Sprite Sheet and Egg CSS --- public/img/sprites/Egg_Sprite_Sheet.png | Bin 6599 -> 6960 bytes public/img/sprites/PetEggs.css | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/img/sprites/Egg_Sprite_Sheet.png b/public/img/sprites/Egg_Sprite_Sheet.png index c2834447bb8f82ded7fb8c9fb3ef39627b5cb564..14c093253f1794fc668ac45a33370287f2860898 100644 GIT binary patch literal 6960 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 Date: Fri, 29 Mar 2013 14:15:17 -0400 Subject: [PATCH 2/6] Remove translations for now --- views/app/tasks.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/app/tasks.html b/views/app/tasks.html index 61c9bd9059..ebdaf1d598 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -25,7 +25,7 @@
-

{{t("Habits")}}

+

Habits

    {#each _habitList as :task}{/} @@ -38,7 +38,7 @@
    -

    {{t("Daily")}}

    +

    Dailies

      {#each _dailyList as :task}{/} @@ -59,7 +59,7 @@ -

      {{t("Todos")}}

      +

      Todos

      From 96ce6da7436f0c1de2ee73bd9bc745f5ed2e0897 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 29 Mar 2013 22:39:56 -0700 Subject: [PATCH 3/6] update habit version to upgrade nodemodules --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 742fab8c50..959ddf1d10 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitrpg", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "0.0.0-150", + "version": "0.0.0-151", "main": "./server.js", "dependencies": { "derby": "git://github.com/Unroll-Me/derby#master", From 86102ce8e791d775863ee8ac4d40864b971b093f Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Fri, 29 Mar 2013 22:44:44 -0700 Subject: [PATCH 4/6] More Gem sizes --- public/img/sprites/Egg_Sprite_Sheet.png | Bin 6960 -> 7524 bytes public/img/sprites/PetEggs.css | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/img/sprites/Egg_Sprite_Sheet.png b/public/img/sprites/Egg_Sprite_Sheet.png index 14c093253f1794fc668ac45a33370287f2860898..716f5e96dec12a3c1e98dc3d006327cff59707e1 100644 GIT binary patch literal 7524 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 literal 6960 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 Date: Fri, 29 Mar 2013 22:50:15 -0700 Subject: [PATCH 5/6] new line --- public/img/sprites/PetEggs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/img/sprites/PetEggs.css b/public/img/sprites/PetEggs.css index c38ae82032..b39998480e 100644 --- a/public/img/sprites/PetEggs.css +++ b/public/img/sprites/PetEggs.css @@ -23,4 +23,4 @@ .Pet_Currency_Gem {background-position: 0px -510px; width: 51px; height: 45px} /* Not an egg or potion so has a different size */ .Pet_Currency_Gem2x {background-position: -55px -513px; width: 34px; height: 30px} -.Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px} \ No newline at end of file +.Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px} From c9907f9558f23835b3add4eaa2ce12d5ff150ddf Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 30 Mar 2013 18:45:57 -0700 Subject: [PATCH 6/6] move some external script loading into app.on('render') to see if that solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo --- src/app/browser.coffee | 44 +++++++++++++++++++++++++----------------- views/app/index.html | 2 -- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/app/browser.coffee b/src/app/browser.coffee index a2bd6f7194..873ce7eb83 100644 --- a/src/app/browser.coffee +++ b/src/app/browser.coffee @@ -9,9 +9,9 @@ restoreRefs = module.exports.restoreRefs = (model) -> model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids" ### - Loads JavaScript files from (1) public/js/* and (2) external sources + Loads JavaScript files from public/js/* If a library is available in a CDN, we put it in (index.html) for better caching. If not, we use - this function to utilize require() to concatinate for faster page load, and $.getScript for asyncronous external script loading + this function to utilize require() to concatinate for faster page load ### loadJavaScripts = (model) -> @@ -24,19 +24,6 @@ loadJavaScripts = (model) -> require '../../public/vendor/bootstrap-tour/bootstrap-tour' - # JS files not needed right away (google charts) or entirely optional (analytics) - # Each file getsload asyncronously via $.getScript, so it doesn't bog page-load - unless model.get('_view.mobileDevice') - - $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire"); - - # Google Charts - $.getScript "//www.google.com/jsapi", -> - # Specifying callback in options param is vital! Otherwise you get blank screen, see http://stackoverflow.com/a/12200566/362790 - google.load "visualization", "1", {packages:["corechart"], callback: ->} - -# Note, Google Analyatics giving beef if in this file. Moved back to index.html. It's ok, it's async - really the -# syncronous requires up top are what benefit the most from this file. ### Setup jQuery UI Sortable @@ -189,6 +176,26 @@ module.exports.resetDom = (model) -> DERBY.app.dom.clear() DERBY.app.view.render(model, DERBY.app.view._lastRender.ns, DERBY.app.view._lastRender.context); +### + Load external scripts that need re-calculation on page re-write +### +loadExternalScripts = (model) -> + $.getScript('//checkout.stripe.com/v2/checkout.js') + + # JS files not needed right away (google charts) or entirely optional (analytics) + # Each file getsload asyncronously via $.getScript, so it doesn't bog page-load + unless model.get('_view.mobileDevice') + + $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire") + + # Google Charts + $.getScript "//www.google.com/jsapi", -> + # Specifying callback in options param is vital! Otherwise you get blank screen, see http://stackoverflow.com/a/12200566/362790 + google.load "visualization", "1", {packages:["corechart"], callback: ->} + +# Note, Google Analyatics giving beef if in this file. Moved back to index.html. It's ok, it's async - really the +# syncronous requires up top are what benefit the most from this file. + module.exports.app = (appExports, model, app) -> loadJavaScripts(model) setupGrowlNotifications(model) unless model.get('_view.mobileDevice') @@ -199,8 +206,9 @@ module.exports.app = (appExports, model, app) -> setupTooltips(model) setupTour(model) initStickyHeader(model) unless model.get('_view.mobileDevice') + loadExternalScripts(model) $('.datepicker').datepicker({autoclose:true, todayBtn:true}) .on 'changeDate', (ev) -> - #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved - #FIXME also, it saves as a day behind?? - model.at(ev.target).set 'date', moment(ev.date).add('d',1).format('MM/DD/YYYY') \ No newline at end of file + #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved + #FIXME also, it saves as a day behind?? + model.at(ev.target).set 'date', moment(ev.date).add('d',1).format('MM/DD/YYYY') \ No newline at end of file diff --git a/views/app/index.html b/views/app/index.html index 43caf7933f..d29d9a52b2 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -61,8 +61,6 @@ - - {{#if equal(_view.nodeEnv,"production")}}