webfontloader 1.4.8 → 1.4.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.4.9 (July 24, 2013)
+* Disable terminal spec report when not using PhantomJS
+* Remove obsolete namespace declaration
+
 v1.4.8 (June 24, 2013)
 * Add support for the Chromium based Opera browser
 * Change the debug task to do a Closure Compiler debug build

data/README.md

@@ -2,6 +2,8 @@
 
 Web Font Loader gives you added control when using linked fonts via `@font-face`. It provides a common interface to loading fonts regardless of the source, then adds a standard set of events you may use to control the loading experience. The Web Font Loader is able to load fonts from [Google Fonts](http://www.google.com/fonts/), [Typekit](http://www.typekit.com/), [Ascender](http://www.ascenderfonts.com/webfonts/), [Fonts.com](http://www.fonts.com/), and [Fontdeck](http://fontdeck.com/), as well as self-hosted web fonts. It is co-developed by [Google](http://www.google.com/) and [Typekit](http://www.typekit.com).
 
+[![Build Status](https://travis-ci.org/typekit/webfontloader.png?branch=master)](https://travis-ci.org/typekit/webfontloader)
+
 ## Contents
 
 * [Get started](#get-started)

data/lib/webfontloader.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'webfontloader/modules'
 
 module WebFontLoader
-  VERSION = '1.4.8'
+  VERSION = '1.4.9'
 
   ProjectRoot = File.expand_path(File.dirname(__FILE__) + "/..")
 

data/spec/core/fontwatchrunner_spec.js

@@ -345,7 +345,11 @@ describe('FontWatchRunner', function () {
       });
 
       runs(function () {
-        expect(inactiveCallback).toHaveBeenCalledWith(elena);
+        if (userAgent.getBrowserInfo().hasWebKitFallbackBug()) {
+          expect(activeCallback).toHaveBeenCalledWith(elena);
+        } else {
+          expect(inactiveCallback).toHaveBeenCalledWith(elena);
+        }
       });
     });
 

data/spec/index.html

@@ -68,7 +68,9 @@
               color: true
             });
 
-        env.addReporter(terminalReporter);
+        if (/PhantomJS/.test(navigator.userAgent)) {
+          env.addReporter(terminalReporter);
+        }
         env.addReporter(htmlReporter);
         env.specFilter = function (spec) {
           return htmlReporter.specFilter(spec);

data/webfontloader.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'webfontloader'
-  s.version           = '1.4.8'
-  s.date              = '2013-06-24'
+  s.version           = '1.4.9'
+  s.date              = '2013-07-24'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -157,7 +157,6 @@ DESC
     src/core/fontwatcher.js
     src/core/fontwatchrunner.js
     src/core/initialize.js
-    src/core/namespace.js
     src/core/useragent.js
     src/core/useragentparser.js
     src/core/version.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 4
-  - 8
-  version: 1.4.8
+  - 9
+  version: 1.4.9
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-24 00:00:00 Z
+date: 2013-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -185,7 +185,6 @@ files:
 - src/core/fontwatcher.js
 - src/core/fontwatchrunner.js
 - src/core/initialize.js
-- src/core/namespace.js
 - src/core/useragent.js
 - src/core/useragentparser.js
 - src/core/version.js

data/src/core/namespace.js

@@ -1 +0,0 @@
-var webfont = {};