Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2280_FixVideoMomeryBug

Author: dingpinglv

cocos2d/CCLoader.js

@@ -276,15 +276,16 @@ cc.Loader = cc.Class.extend(/** @lends cc.Loader# */{
     },
 
     _registerFaceFont:function (fontRes) {
-        var srcArr = cc.FileUtils.getInstance().fullPathForFilename(fontRes.src);
+        var srcArr = fontRes.src;
+        var fileUtils = cc.FileUtils.getInstance();
         if (srcArr && srcArr.length > 0) {
             var fontStyle = document.createElement("style");
             fontStyle.type = "text/css";
             document.body.appendChild(fontStyle);
 
             var fontStr = "@font-face { font-family:" + fontRes.fontName + "; src:";
             for (var i = 0; i < srcArr.length; i++) {
-                fontStr += "url('" + encodeURI(srcArr[i].src) + "') format('" + srcArr[i].type + "')";
+                fontStr += "url('" + fileUtils.fullPathForFilename(encodeURI(srcArr[i].src)) + "') format('" + srcArr[i].type + "')";
                 fontStr += (i == (srcArr.length - 1)) ? ";" : ",";
             }
             fontStyle.textContent += fontStr + "};";
@@ -549,4 +550,4 @@ cc.LoaderScene.preload = function (resources, selector, target) {
 
     this._instance.initWithResources(resources, selector, target);
     return this._instance;
-};
+};