taskwarrior-web 1.1.6 → 1.1.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.7 (12/24/12)
+
+* Small hotfix for JS load order.
+
 ## v1.1.6 (12/16/12)
 
 * Added sort options to all task listings.

data/lib/taskwarrior-web/public/js/application.js

@@ -122,11 +122,12 @@ var initTablesort = function() {
 // Count updating.
 
 var refreshDockBadge = function() {
-	if (window.hasOwnProperty('fluid')) {
-		$.get('/ajax/badge', function(data) {
-			window.fluid.dockBadge = data;
-		});
-	}
+  $.get('/ajax/badge', function(data) {
+    Tinycon.setBubble(data);
+    if (window.hasOwnProperty('fluid')) {
+      window.fluid.dockBadge = data;
+    }
+  });
 };
 
 var refreshSubnavCount = function() {

data/lib/taskwarrior-web/public/js/tinycon.min.js

@@ -0,0 +1,8 @@
+/*!
+  Tinycon - A small library for manipulating the Favicon
+  Tom Moor, http://tommoor.com
+  Copyright (c) 2012 Tom Moor
+  MIT Licensed
+  @version 0.5
+*/
+(function(){var Tinycon={};var currentFavicon=null;var originalFavicon=null;var originalTitle=document.title;var faviconImage=null;var canvas=null;var options={};var defaults={width:7,height:9,font:'10px arial',colour:'#ffffff',background:'#F03D25',fallback:true,abbreviate:true};var ua=(function(){var agent=navigator.userAgent.toLowerCase();return function(browser){return agent.indexOf(browser)!==-1}}());var browser={ie:ua('msie'),chrome:ua('chrome'),webkit:ua('chrome')||ua('safari'),safari:ua('safari')&&!ua('chrome'),mozilla:ua('mozilla')&&!ua('chrome')&&!ua('safari')};var getFaviconTag=function(){var links=document.getElementsByTagName('link');for(var i=0,len=links.length;i<len;i++){if((links[i].getAttribute('rel')||'').match(/\bicon\b/)){return links[i]}}return false};var removeFaviconTag=function(){var links=document.getElementsByTagName('link');var head=document.getElementsByTagName('head')[0];for(var i=0,len=links.length;i<len;i++){var exists=(typeof(links[i])!=='undefined');if(exists&&(links[i].getAttribute('rel')||'').match(/\bicon\b/)){head.removeChild(links[i])}}};var getCurrentFavicon=function(){if(!originalFavicon||!currentFavicon){var tag=getFaviconTag();originalFavicon=currentFavicon=tag?tag.getAttribute('href'):'/favicon.ico'}return currentFavicon};var getCanvas=function(){if(!canvas){canvas=document.createElement("canvas");canvas.width=16;canvas.height=16}return canvas};var setFaviconTag=function(url){removeFaviconTag();var link=document.createElement('link');link.type='image/x-icon';link.rel='icon';link.href=url;document.getElementsByTagName('head')[0].appendChild(link)};var log=function(message){if(window.console)window.console.log(message)};var drawFavicon=function(label,colour){if(!getCanvas().getContext||browser.ie||browser.safari||options.fallback==='force'){return updateTitle(label)}var context=getCanvas().getContext("2d");var colour=colour||'#000000';var src=getCurrentFavicon();faviconImage=new Image();faviconImage.onload=function(){context.clearRect(0,0,16,16);context.drawImage(faviconImage,0,0,faviconImage.width,faviconImage.height,0,0,16,16);if((label+'').length>0)drawBubble(context,label,colour);refreshFavicon()};if(!src.match(/^data/)){faviconImage.crossOrigin='anonymous'}faviconImage.src=src};var updateTitle=function(label){if(options.fallback){if((label+'').length>0){document.title='('+label+') '+originalTitle}else{document.title=originalTitle}}};var drawBubble=function(context,label,colour){if(typeof label=='number'&&label>99&&options.abbreviate){label=abbreviateNumber(label)}var len=(label+'').length-1;var width=options.width+(6*len);var w=16-width;var h=16-options.height;context.font=(browser.webkit?'bold ':'')+options.font;context.fillStyle=options.background;context.strokeStyle=options.background;context.lineWidth=1;context.fillRect(w,h,width-1,options.height);context.beginPath();context.moveTo(w-0.5,h+1);context.lineTo(w-0.5,15);context.stroke();context.beginPath();context.moveTo(15.5,h+1);context.lineTo(15.5,15);context.stroke();context.beginPath();context.strokeStyle="rgba(0,0,0,0.3)";context.moveTo(w,16);context.lineTo(15,16);context.stroke();context.fillStyle=options.colour;context.textAlign="right";context.textBaseline="top";context.fillText(label,15,browser.mozilla?7:6)};var refreshFavicon=function(){if(!getCanvas().getContext)return;setFaviconTag(getCanvas().toDataURL())};var abbreviateNumber=function(label){var metricPrefixes=[['G',1000000000],['M',1000000],['k',1000]];for(var i=0;i<metricPrefixes.length;++i){if(label>=metricPrefixes[i][1]){label=round(label/metricPrefixes[i][1])+metricPrefixes[i][0];break}}return label};var round=function(value,precision){var number=new Number(value);return number.toFixed(precision)};Tinycon.setOptions=function(custom){options={};for(var key in defaults){options[key]=custom.hasOwnProperty(key)?custom[key]:defaults[key]}return this};Tinycon.setImage=function(url){currentFavicon=url;refreshFavicon();return this};Tinycon.setBubble=function(label,colour){label=label||'';drawFavicon(label,colour);return this};Tinycon.reset=function(){setFaviconTag(originalFavicon)};Tinycon.setOptions(defaults);window.Tinycon=Tinycon})();

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

data/lib/taskwarrior-web/views/layout.erb

@@ -6,6 +6,11 @@
     <% %w(bootstrap.min datepicker styles).each do |file| %>
       <link rel="stylesheet" href="<%= url("/css/#{file}.css") %>">
     <% end %>
+
+    <!-- Scripts -->
+    <% %w(jquery.min bootstrap bootstrap-datepicker jquery.hotkeys jquery.dataTables.min tinycon.min application).each do |file| %>
+      <script text="text/javascript" src="<%= url("/js/#{file}.js") %>"></script>
+    <% end %>
   </head>
 
   <body data-spy="scroll" data-offset="60" data-target="#sidebar">
@@ -25,10 +30,6 @@
         <%= erb :_footer %>
       </div>
     </div>
-    <!-- Scripts -->
-    <% %w(jquery.min bootstrap bootstrap-datepicker jquery.hotkeys jquery.dataTables.min application).each do |file| %>
-      <script text="text/javascript" src="<%= url("/js/#{file}.js") %>"></script>
-    <% end %>
     <%= erb :_hotkeys %>
   </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70159255643600 !ruby/object:Gem::Requirement
+  requirement: &70241652704400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255643600
+  version_requirements: *70241652704400
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70159255642460 !ruby/object:Gem::Requirement
+  requirement: &70241652703520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255642460
+  version_requirements: *70241652703520
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70159255634520 !ruby/object:Gem::Requirement
+  requirement: &70241652702700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255634520
+  version_requirements: *70241652702700
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70159255633300 !ruby/object:Gem::Requirement
+  requirement: &70241652702020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255633300
+  version_requirements: *70241652702020
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70159255630700 !ruby/object:Gem::Requirement
+  requirement: &70241652701260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255630700
+  version_requirements: *70241652701260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70159255628820 !ruby/object:Gem::Requirement
+  requirement: &70241652699640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255628820
+  version_requirements: *70241652699640
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
-  requirement: &70159255626780 !ruby/object:Gem::Requirement
+  requirement: &70241652698200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255626780
+  version_requirements: *70241652698200
 - !ruby/object:Gem::Dependency
   name: rack-flash3
-  requirement: &70159255619140 !ruby/object:Gem::Requirement
+  requirement: &70241652697520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159255619140
+  version_requirements: *70241652697520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70159255617700 !ruby/object:Gem::Requirement
+  requirement: &70241652696680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70159255617700
+  version_requirements: *70241652696680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70159255616820 !ruby/object:Gem::Requirement
+  requirement: &70241652695180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70159255616820
+  version_requirements: *70241652695180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70159255615720 !ruby/object:Gem::Requirement
+  requirement: &70241652692800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70159255615720
+  version_requirements: *70241652692800
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70159255615060 !ruby/object:Gem::Requirement
+  requirement: &70241652690820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70159255615060
+  version_requirements: *70241652690820
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -189,6 +189,7 @@ files:
 - lib/taskwarrior-web/public/js/jquery.dataTables.min.js
 - lib/taskwarrior-web/public/js/jquery.hotkeys.js
 - lib/taskwarrior-web/public/js/jquery.min.js
+- lib/taskwarrior-web/public/js/tinycon.min.js
 - lib/taskwarrior-web/services/builder.rb
 - lib/taskwarrior-web/services/builder/base.rb
 - lib/taskwarrior-web/services/builder/v1.rb
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1376655682061466649
+      hash: -1525121623086071772
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11