From 37e86bcd9b59ac142303045539c4568c3a58d5e7 Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 14 Sep 2016 10:11:04 +0800 Subject: [PATCH 1/7] ignore line 34,duplicate call --- src/angular-fontawesome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/angular-fontawesome.js b/src/angular-fontawesome.js index 4acc224..c7641cb 100644 --- a/src/angular-fontawesome.js +++ b/src/angular-fontawesome.js @@ -31,7 +31,7 @@ angular.module('picardy.fontawesome', []) _observeStringAttr('name', 'fa'); _observeStringAttr('rotate'); _observeStringAttr('flip'); - _observeStringAttr('stack'); + //_observeStringAttr('stack'); /** * size can be passed "large" or an integer From f1e9df1577ab60af90be3b7e6d70d3e18cce3a35 Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 14 Sep 2016 14:27:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?remove=20duplicate=20invoke=20in=20directiv?= =?UTF-8?q?e=20`fa`=20and=20`faStack`,add=20util=20factory=20and=20merge?= =?UTF-8?q?=20=5FobserveStringAttr=E3=80=81=5FobserveNumberAttr=E3=80=81?= =?UTF-8?q?=5FobserveBooleanAttr=E3=80=81=5FobserveAltAttr=20into=20=5Fobs?= =?UTF-8?q?erveAttrWrapper,use=20=5FobserveAttr=20identify=20different=20a?= =?UTF-8?q?ttribute=20and=20call=20different=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/angular-fontawesome.js | 246 ++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 127 deletions(-) diff --git a/src/angular-fontawesome.js b/src/angular-fontawesome.js index c7641cb..dc7ca59 100644 --- a/src/angular-fontawesome.js +++ b/src/angular-fontawesome.js @@ -1,91 +1,18 @@ 'use strict'; angular.module('picardy.fontawesome', []) - .directive('fa', function () { + .directive('fa', ['util',function (util) { return { restrict: 'E', template: '', replace: true, link: function (scope, element, attrs) { - - /*** STRING ATTRS ***/ - // keep a state of the current attrs so that when they change, - // we can remove the old attrs before adding the new ones. - var currentClasses = {}; - - // generic function to bind string attrs - function _observeStringAttr (attr, baseClass) { - var className; - - attrs.$observe(attr, function () { - baseClass = baseClass || 'fa-' + attr; - element.removeClass(currentClasses[attr]); - if (attrs[attr]) { - className = [baseClass, attrs[attr]].join('-'); - element.addClass(className); - currentClasses[attr] = className; - } - }); - } - - _observeStringAttr('name', 'fa'); - _observeStringAttr('rotate'); - _observeStringAttr('flip'); - //_observeStringAttr('stack'); - - /** - * size can be passed "large" or an integer - */ - attrs.$observe('size', function () { - var className; - element.removeClass(currentClasses.size); - - if (attrs.size === 'large') { - className = 'fa-lg'; - } else if (!isNaN(parseInt(attrs.size, 10))) { - className = 'fa-' + attrs.size + 'x'; - } - - element.addClass(className); - currentClasses.size = className; - }); - - /** - * stack can be passed "large" or an integer - */ - attrs.$observe('stack', function () { - var className; - element.removeClass(currentClasses.stack); - - if (attrs.stack === 'large') { - className = 'fa-stack-lg'; - } else if (!isNaN(parseInt(attrs.stack, 10))) { - className = 'fa-stack-' + attrs.stack + 'x'; - } - - element.addClass(className); - currentClasses.stack = className; - }); - - /*** BOOLEAN ATTRS ***/ - // generic function to bind boolean attrs - function _observeBooleanAttr (attr, className) { - var value; - - attrs.$observe(attr, function () { - className = className || 'fa-' + attr; - value = attr in attrs && attrs[attr] !== 'false' && attrs[attr] !== false; - element.toggleClass(className, value); - }); - } - - _observeBooleanAttr('border'); - _observeBooleanAttr('fw'); - _observeBooleanAttr('inverse'); - _observeBooleanAttr('spin'); - + var _observeAttrWrapper = util._observeAttrWrapper(attrs, element) + util._keys(attrs).forEach(function(e,i){ + _observeAttrWrapper._observeAttr(e) + }) /*** CONDITIONAL ATTRS ***/ - // automatically populate fa-li if DOM structure indicates + // automatically populate fa-li if DOM structure indicates element.toggleClass('fa-li', element.parent() && element.parent().prop('tagName') === 'LI' && @@ -95,7 +22,73 @@ angular.module('picardy.fontawesome', []) attrs.list !== 'false' && attrs.list !== false ); + } + }; + }]) + .directive('faStack',['util', function (util) { + return { + restrict: 'E', + transclude: true, + template: '', + replace: true, + link: function (scope, element, attrs) { + var _observeAttrWrapper = util._observeAttrWrapper(attrs, element) + _observeAttrWrapper._observeAttr('size','fa'); + } + }; + }]) + .factory('util',function(){ + function _observeAttrWrapper(attrs, element){ + /*** STRING ATTRS ***/ + // keep a state of the current attrs so that when they change, + // we can remove the old attrs before adding the new ones. + var currentClasses = {}; + + // generic function to bind string attrs + // attributes like name、rotate、flip + function _observeStringAttr (attr, baseClass) { + // check attrs[attr] string or empty + if(!angular.isString(attrs[attr] || !!attrs[attr])) + return; + var className; + baseClass = baseClass || 'fa-' + attr; // make baseClass + //element.removeClass(currentClasses[attr]); // remove old className from dom element + className = [baseClass, attrs[attr]].join('-'); // connnect baseClass and attrs[attr] with '-' + element.addClass(className); // add className to dom element + //currentClasses[attr] = className; // override className within currentClass Object + } + + // generic function to bind string attrs + // attributes like size、stack + function _observeNumberAttr (attr, baseClass) { + // check attrs[attr] String or empty (ignore 0) + if(!angular.isString(attrs[attr] || !!attrs[attr])) + return; + var className; + baseClass = baseClass || 'fa-' + attr; // make baseClass + //element.removeClass(currentClasses[attr]); // remove old className from dom element + + if (attrs[attr] === 'large') { // connnect baseClass and attrs[attr] with '-' + className = [baseClass,'lg'].join('-'); + } else if (!isNaN(parseInt(attrs[attr], 10))) { + className = [baseClass,attrs[attr]+'x'].join('-'); + } + element.addClass(className); // add className to dom element + //currentClasses[attr] = className; // override className within currentClass Object + + } + + + // generic function to bind boolean attrs + function _observeBooleanAttr (attr, baseClass) { + var value; + baseClass = baseClass || 'fa-' + attr; + value = attr in attrs && attrs[attr] !== 'false' && attrs[attr] !== false; + element.toggleClass(baseClass, value); + } + + function _observeAltAttr () { attrs.$observe('alt', function () { var altText = attrs.alt, altElem = element.next(), @@ -117,55 +110,54 @@ angular.module('picardy.fontawesome', []) } }); } - }; - }) - .directive('faStack', function () { - return { - restrict: 'E', - transclude: true, - template: '', - replace: true, - link: function (scope, element, attrs) { - - /*** STRING ATTRS ***/ - // keep a state of the current attrs so that when they change, - // we can remove the old attrs before adding the new ones. - var currentClasses = {}; - - // generic function to bind string attrs - function _observeStringAttr (attr, baseClass) { - var className; - - attrs.$observe(attr, function () { - baseClass = baseClass || 'fa-' + attr; - element.removeClass(currentClasses[attr]); - if (attrs[attr]) { - className = [baseClass, attrs[attr]].join('-'); - element.addClass(className); - currentClasses[attr] = className; - } - }); - } - - _observeStringAttr('size'); - - /** - * size can be passed "large" or an integer - */ - attrs.$observe('size', function () { - var className; - element.removeClass(currentClasses.size); - if (attrs.size === 'large') { - className = 'fa-lg'; - } else if (!isNaN(parseInt(attrs.size, 10))) { - className = 'fa-' + attrs.size + 'x'; + function _observeAttr(attr){ + switch(attr){ + case 'name': + _observeStringAttr(attr, 'fa'); + break; + case 'rotate': + case 'flip': + _observeStringAttr(attr); + break; + case 'size': + _observeNumberAttr(attr,'fa'); + break; + case 'stack': + _observeNumberAttr(attr); + break; + case 'border': + case 'fw': + case 'inverse': + case 'spin': + _observeBooleanAttr(attr); + break; + case 'alt': + _observeAltAttr(); + break; } - - element.addClass(className); - currentClasses.size = className; - }); } - }; - }); + return { + _observeAttr: _observeAttr + } + } + + // get object keys and filter keys according keyWhiteList + // var keyWhiteList = ['name','rotate','flip','size','stack','border','fw','inverse','spin','alt']; + function _keys(obj, keyWhiteList){ + var keys = []; + keyWhiteList = keyWhiteList || ['name','rotate','flip','size','stack','border','fw','inverse','spin']; + for(var key in obj){ + keys.push(key); + } + keys = keys.filter(function(e,i){ + return keyWhiteList.indexOf(e) == -1 ? false : true; + }); + return keys; + } + return { + _observeAttrWrapper : _observeAttrWrapper, + _keys : _keys + } + }) From 67d351779311c2b0204d26657941e23ae1930456 Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 14 Sep 2016 14:37:57 +0800 Subject: [PATCH 3/7] revert attrs.$observer --- src/angular-fontawesome.js | 83 ++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 16 deletions(-) diff --git a/src/angular-fontawesome.js b/src/angular-fontawesome.js index dc7ca59..d045ad2 100644 --- a/src/angular-fontawesome.js +++ b/src/angular-fontawesome.js @@ -9,8 +9,10 @@ angular.module('picardy.fontawesome', []) link: function (scope, element, attrs) { var _observeAttrWrapper = util._observeAttrWrapper(attrs, element) util._keys(attrs).forEach(function(e,i){ - _observeAttrWrapper._observeAttr(e) + _observeAttrWrapper._observeAttr(e); }) + + /*** CONDITIONAL ATTRS ***/ // automatically populate fa-li if DOM structure indicates element.toggleClass('fa-li', @@ -32,8 +34,46 @@ angular.module('picardy.fontawesome', []) template: '', replace: true, link: function (scope, element, attrs) { - var _observeAttrWrapper = util._observeAttrWrapper(attrs, element) - _observeAttrWrapper._observeAttr('size','fa'); + + /*** STRING ATTRS ***/ + // keep a state of the current attrs so that when they change, + // we can remove the old attrs before adding the new ones. + var currentClasses = {}; + + // generic function to bind string attrs + function _observeStringAttr (attr, baseClass) { + var className; + + attrs.$observe(attr, function () { + baseClass = baseClass || 'fa-' + attr; + element.removeClass(currentClasses[attr]); + if (attrs[attr]) { + className = [baseClass, attrs[attr]].join('-'); + element.addClass(className); + currentClasses[attr] = className; + } + }); + } + + _observeStringAttr('size'); + + /** + * size can be passed "large" or an integer + */ + attrs.$observe('size', function () { + var className; + + element.removeClass(currentClasses.size); + + if (attrs.size === 'large') { + className = 'fa-lg'; + } else if (!isNaN(parseInt(attrs.size, 10))) { + className = 'fa-' + attrs.size + 'x'; + } + + element.addClass(className); + currentClasses.size = className; + }); } }; }]) @@ -48,14 +88,19 @@ angular.module('picardy.fontawesome', []) // attributes like name、rotate、flip function _observeStringAttr (attr, baseClass) { // check attrs[attr] string or empty + //console.log(attrs); + //console.log(attr); + //console.log(attrs[attr]); if(!angular.isString(attrs[attr] || !!attrs[attr])) return; var className; - baseClass = baseClass || 'fa-' + attr; // make baseClass - //element.removeClass(currentClasses[attr]); // remove old className from dom element - className = [baseClass, attrs[attr]].join('-'); // connnect baseClass and attrs[attr] with '-' - element.addClass(className); // add className to dom element - //currentClasses[attr] = className; // override className within currentClass Object + attrs.$observe(attr, function () { + baseClass = baseClass || 'fa-' + attr; // make baseClass + element.removeClass(currentClasses[attr]); // remove old className from dom element + className = [baseClass, attrs[attr]].join('-'); // connnect baseClass and attrs[attr] with '-' + element.addClass(className); // add className to dom element + currentClasses[attr] = className; // override className within currentClass Object + }); } // generic function to bind string attrs @@ -66,7 +111,7 @@ angular.module('picardy.fontawesome', []) return; var className; baseClass = baseClass || 'fa-' + attr; // make baseClass - //element.removeClass(currentClasses[attr]); // remove old className from dom element + element.removeClass(currentClasses[attr]); // remove old className from dom element if (attrs[attr] === 'large') { // connnect baseClass and attrs[attr] with '-' className = [baseClass,'lg'].join('-'); @@ -74,17 +119,20 @@ angular.module('picardy.fontawesome', []) className = [baseClass,attrs[attr]+'x'].join('-'); } element.addClass(className); // add className to dom element - //currentClasses[attr] = className; // override className within currentClass Object + currentClasses[attr] = className; // override className within currentClass Object } // generic function to bind boolean attrs - function _observeBooleanAttr (attr, baseClass) { + function _observeBooleanAttr (attr, className) { var value; - baseClass = baseClass || 'fa-' + attr; - value = attr in attrs && attrs[attr] !== 'false' && attrs[attr] !== false; - element.toggleClass(baseClass, value); + + attrs.$observe(attr, function () { + className = className || 'fa-' + attr; + value = attr in attrs && attrs[attr] !== 'false' && attrs[attr] !== false; + element.toggleClass(className, value); + }); } @@ -111,7 +159,6 @@ angular.module('picardy.fontawesome', []) }); } - function _observeAttr(attr){ switch(attr){ case 'name': @@ -139,7 +186,11 @@ angular.module('picardy.fontawesome', []) } } return { - _observeAttr: _observeAttr + _observeStringAttr : _observeStringAttr, + _observeNumberAttr : _observeNumberAttr, + _observeBooleanAttr : _observeBooleanAttr, + _observeAltAttr : _observeAltAttr, + _observeAttr : _observeAttr } } From 7a0e5e724278d35f12f2bd58a01b0dc0cb6a3ae5 Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 14 Sep 2016 14:47:49 +0800 Subject: [PATCH 4/7] test travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8385de2..70e634e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,4 @@ node_js: - 0.10 before_script: - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start -notifications: - slack: picardy:1mUjogRmeRd1mUdr5a4quAfs \ No newline at end of file + - sh -e /etc/init.d/xvfb start \ No newline at end of file From ad8806cba55794d4425119f86ec17053cab4d77f Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 14 Sep 2016 15:21:05 +0800 Subject: [PATCH 5/7] use grunt test-suite --- src/angular-fontawesome.js | 91 +++++++++++--------------------------- 1 file changed, 25 insertions(+), 66 deletions(-) diff --git a/src/angular-fontawesome.js b/src/angular-fontawesome.js index d045ad2..8fd76f7 100644 --- a/src/angular-fontawesome.js +++ b/src/angular-fontawesome.js @@ -7,11 +7,10 @@ angular.module('picardy.fontawesome', []) template: '', replace: true, link: function (scope, element, attrs) { - var _observeAttrWrapper = util._observeAttrWrapper(attrs, element) - util._keys(attrs).forEach(function(e,i){ + var _observeAttrWrapper = util._observeAttrWrapper(attrs, element); + util._keys(attrs).forEach(function (e) { _observeAttrWrapper._observeAttr(e); - }) - + }); /*** CONDITIONAL ATTRS ***/ // automatically populate fa-li if DOM structure indicates @@ -34,51 +33,13 @@ angular.module('picardy.fontawesome', []) template: '', replace: true, link: function (scope, element, attrs) { - - /*** STRING ATTRS ***/ - // keep a state of the current attrs so that when they change, - // we can remove the old attrs before adding the new ones. - var currentClasses = {}; - - // generic function to bind string attrs - function _observeStringAttr (attr, baseClass) { - var className; - - attrs.$observe(attr, function () { - baseClass = baseClass || 'fa-' + attr; - element.removeClass(currentClasses[attr]); - if (attrs[attr]) { - className = [baseClass, attrs[attr]].join('-'); - element.addClass(className); - currentClasses[attr] = className; - } - }); - } - - _observeStringAttr('size'); - - /** - * size can be passed "large" or an integer - */ - attrs.$observe('size', function () { - var className; - - element.removeClass(currentClasses.size); - - if (attrs.size === 'large') { - className = 'fa-lg'; - } else if (!isNaN(parseInt(attrs.size, 10))) { - className = 'fa-' + attrs.size + 'x'; - } - - element.addClass(className); - currentClasses.size = className; - }); + var _observeAttrWrapper = util._observeAttrWrapper(attrs, element); + _observeAttrWrapper._observeAttr('size'); } }; }]) - .factory('util',function(){ - function _observeAttrWrapper(attrs, element){ + .factory('util',function () { + function _observeAttrWrapper (attrs, element) { /*** STRING ATTRS ***/ // keep a state of the current attrs so that when they change, // we can remove the old attrs before adding the new ones. @@ -88,12 +49,10 @@ angular.module('picardy.fontawesome', []) // attributes like name、rotate、flip function _observeStringAttr (attr, baseClass) { // check attrs[attr] string or empty - //console.log(attrs); - //console.log(attr); - //console.log(attrs[attr]); - if(!angular.isString(attrs[attr] || !!attrs[attr])) - return; var className; + if (!angular.isString(attrs[attr] || !!attrs[attr])) { + return; + } attrs.$observe(attr, function () { baseClass = baseClass || 'fa-' + attr; // make baseClass element.removeClass(currentClasses[attr]); // remove old className from dom element @@ -107,16 +66,17 @@ angular.module('picardy.fontawesome', []) // attributes like size、stack function _observeNumberAttr (attr, baseClass) { // check attrs[attr] String or empty (ignore 0) - if(!angular.isString(attrs[attr] || !!attrs[attr])) - return; var className; + if (!angular.isString(attrs[attr] || !!attrs[attr])) { + return; + } baseClass = baseClass || 'fa-' + attr; // make baseClass element.removeClass(currentClasses[attr]); // remove old className from dom element if (attrs[attr] === 'large') { // connnect baseClass and attrs[attr] with '-' className = [baseClass,'lg'].join('-'); } else if (!isNaN(parseInt(attrs[attr], 10))) { - className = [baseClass,attrs[attr]+'x'].join('-'); + className = [baseClass,attrs[attr] + 'x'].join('-'); } element.addClass(className); // add className to dom element currentClasses[attr] = className; // override className within currentClass Object @@ -159,8 +119,8 @@ angular.module('picardy.fontawesome', []) }); } - function _observeAttr(attr){ - switch(attr){ + function _observeAttr (attr) { + switch (attr) { case 'name': _observeStringAttr(attr, 'fa'); break; @@ -191,24 +151,23 @@ angular.module('picardy.fontawesome', []) _observeBooleanAttr : _observeBooleanAttr, _observeAltAttr : _observeAltAttr, _observeAttr : _observeAttr - } + }; } // get object keys and filter keys according keyWhiteList // var keyWhiteList = ['name','rotate','flip','size','stack','border','fw','inverse','spin','alt']; - function _keys(obj, keyWhiteList){ - var keys = []; + function _keys (obj, keyWhiteList) { + var keys = [],key; keyWhiteList = keyWhiteList || ['name','rotate','flip','size','stack','border','fw','inverse','spin']; - for(var key in obj){ - keys.push(key); + for (key in obj) { + if (keyWhiteList.indexOf(key) !== -1) { + keys.push(key); + } } - keys = keys.filter(function(e,i){ - return keyWhiteList.indexOf(e) == -1 ? false : true; - }); return keys; } return { _observeAttrWrapper : _observeAttrWrapper, _keys : _keys - } - }) + }; + }); From 72564e4e9db985a378a0bdb82811b4a2a92b1afb Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 14 Sep 2016 16:17:54 +0800 Subject: [PATCH 6/7] local test --- src/angular-fontawesome.js | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/angular-fontawesome.js b/src/angular-fontawesome.js index 8fd76f7..3e61331 100644 --- a/src/angular-fontawesome.js +++ b/src/angular-fontawesome.js @@ -9,9 +9,19 @@ angular.module('picardy.fontawesome', []) link: function (scope, element, attrs) { var _observeAttrWrapper = util._observeAttrWrapper(attrs, element); util._keys(attrs).forEach(function (e) { + //console.log(e); _observeAttrWrapper._observeAttr(e); }); - + //_observeAttrWrapper._observeAttr('name'); + //_observeAttrWrapper._observeAttr('rotate'); + //_observeAttrWrapper._observeAttr('flip'); + //_observeAttrWrapper._observeAttr('size'); + //_observeAttrWrapper._observeAttr('stack'); + //_observeAttrWrapper._observeAttr('border'); + //_observeAttrWrapper._observeAttr('fw'); + //_observeAttrWrapper._observeAttr('inverse'); + //_observeAttrWrapper._observeAttr('spin'); + //_observeAttrWrapper._observeAttr('alt'); /*** CONDITIONAL ATTRS ***/ // automatically populate fa-li if DOM structure indicates element.toggleClass('fa-li', @@ -50,9 +60,11 @@ angular.module('picardy.fontawesome', []) function _observeStringAttr (attr, baseClass) { // check attrs[attr] string or empty var className; + /* if (!angular.isString(attrs[attr] || !!attrs[attr])) { return; } + */ attrs.$observe(attr, function () { baseClass = baseClass || 'fa-' + attr; // make baseClass element.removeClass(currentClasses[attr]); // remove old className from dom element @@ -66,10 +78,15 @@ angular.module('picardy.fontawesome', []) // attributes like size、stack function _observeNumberAttr (attr, baseClass) { // check attrs[attr] String or empty (ignore 0) - var className; + //var className; + /* if (!angular.isString(attrs[attr] || !!attrs[attr])) { return; } + */ + /* + console.log(attrs); + console.log(attr); baseClass = baseClass || 'fa-' + attr; // make baseClass element.removeClass(currentClasses[attr]); // remove old className from dom element @@ -78,8 +95,23 @@ angular.module('picardy.fontawesome', []) } else if (!isNaN(parseInt(attrs[attr], 10))) { className = [baseClass,attrs[attr] + 'x'].join('-'); } + console.log(className); element.addClass(className); // add className to dom element currentClasses[attr] = className; // override className within currentClass Object + */ + attrs.$observe(attr, function () { + var className; + baseClass = baseClass || 'fa-' + attr; + element.removeClass(currentClasses[attr]); + if (attrs[attr] === 'large') { + className = [baseClass,'lg'].join('-'); + } else if (!isNaN(parseInt(attrs[attr], 10))) { + className = [baseClass,attrs[attr] + 'x'].join('-'); + } + + element.addClass(className); + currentClasses.size = className; + }); } @@ -158,7 +190,7 @@ angular.module('picardy.fontawesome', []) // var keyWhiteList = ['name','rotate','flip','size','stack','border','fw','inverse','spin','alt']; function _keys (obj, keyWhiteList) { var keys = [],key; - keyWhiteList = keyWhiteList || ['name','rotate','flip','size','stack','border','fw','inverse','spin']; + keyWhiteList = keyWhiteList || ['name','rotate','flip','size','stack','border','fw','inverse','spin','alt']; for (key in obj) { if (keyWhiteList.indexOf(key) !== -1) { keys.push(key); From 5778c0fe8a2924b1d977fea9f2602e69824157a2 Mon Sep 17 00:00:00 2001 From: warjiang Date: Wed, 14 Sep 2016 16:28:36 +0800 Subject: [PATCH 7/7] remove some comment --- src/angular-fontawesome.js | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/src/angular-fontawesome.js b/src/angular-fontawesome.js index 3e61331..b76cb8e 100644 --- a/src/angular-fontawesome.js +++ b/src/angular-fontawesome.js @@ -9,19 +9,8 @@ angular.module('picardy.fontawesome', []) link: function (scope, element, attrs) { var _observeAttrWrapper = util._observeAttrWrapper(attrs, element); util._keys(attrs).forEach(function (e) { - //console.log(e); _observeAttrWrapper._observeAttr(e); }); - //_observeAttrWrapper._observeAttr('name'); - //_observeAttrWrapper._observeAttr('rotate'); - //_observeAttrWrapper._observeAttr('flip'); - //_observeAttrWrapper._observeAttr('size'); - //_observeAttrWrapper._observeAttr('stack'); - //_observeAttrWrapper._observeAttr('border'); - //_observeAttrWrapper._observeAttr('fw'); - //_observeAttrWrapper._observeAttr('inverse'); - //_observeAttrWrapper._observeAttr('spin'); - //_observeAttrWrapper._observeAttr('alt'); /*** CONDITIONAL ATTRS ***/ // automatically populate fa-li if DOM structure indicates element.toggleClass('fa-li', @@ -84,33 +73,18 @@ angular.module('picardy.fontawesome', []) return; } */ - /* - console.log(attrs); - console.log(attr); - baseClass = baseClass || 'fa-' + attr; // make baseClass - element.removeClass(currentClasses[attr]); // remove old className from dom element - - if (attrs[attr] === 'large') { // connnect baseClass and attrs[attr] with '-' - className = [baseClass,'lg'].join('-'); - } else if (!isNaN(parseInt(attrs[attr], 10))) { - className = [baseClass,attrs[attr] + 'x'].join('-'); - } - console.log(className); - element.addClass(className); // add className to dom element - currentClasses[attr] = className; // override className within currentClass Object - */ attrs.$observe(attr, function () { var className; - baseClass = baseClass || 'fa-' + attr; - element.removeClass(currentClasses[attr]); + baseClass = baseClass || 'fa-' + attr; // make baseClass + element.removeClass(currentClasses[attr]); // remove old className from dom element if (attrs[attr] === 'large') { - className = [baseClass,'lg'].join('-'); + className = [baseClass,'lg'].join('-'); // connnect baseClass and attrs[attr] with '-' } else if (!isNaN(parseInt(attrs[attr], 10))) { className = [baseClass,attrs[attr] + 'x'].join('-'); } - element.addClass(className); - currentClasses.size = className; + element.addClass(className); // add className to dom element + currentClasses.size = className; // override className within currentClass Object }); }