mofron-comp-text - npm Package Compare versions

Comparing version 0.3.6 to 0.3.7

dist/text.js

@@ -65,8 +65,7 @@ require("mofron-event-click");
 	 */
+	mofron.comp.Text = function (_mofron$Component) {
+	    _inherits(_class, _mofron$Component);
 
-	mofron.comp.Text = function (_mofron$comp$Base) {
-	    _inherits(_class, _mofron$comp$Base);
-
 	    /**
-	     * initialize font theme
+	     * initialize text component
 	     *
@@ -80,7 +79,14 @@ * @param prm : (string) text contents
 	        try {
-	            var _this = _possibleConstructorReturn(this, (_class.__proto__ || Object.getPrototypeOf(_class)).call(this, prm, opt));
+	            var _this = _possibleConstructorReturn(this, (_class.__proto__ || Object.getPrototypeOf(_class)).call(this, prm));
 
+	            _this.setBaseName('Text');
 	            _this.name('Text');
+
 	            /* font theme */
 	            _this.m_font = null;
+
+	            /* set option */
+	            if (null !== opt) {
+	                _this.option(opt);
+	            }
 	        } catch (e) {
@@ -118,6 +124,6 @@ console.error(e.stack);
 	                /* set font theme */
-	                //this.m_theme.get('Font');
-	                //if (null !== this.m_font) {
-	                //    this.setFontTheme(this.m_font);
-	                //}
+	                var fnt = this.theme().getFont(0);
+	                if (null !== fnt) {
+	                    this.setFontTheme(fnt);
+	                }
 	            } catch (e) {
@@ -230,3 +236,3 @@ console.error(e.stack);
 	                if (null === _clr) {
-	                    return mofron.util.getColorObj(this.style('color'));
+	                    return mofron.func.getColorObj(this.style('color'));
 	                }
@@ -257,3 +263,3 @@ if ('object' !== (typeof _clr === 'undefined' ? 'undefined' : _typeof(_clr))) {
 	                    /* getter */
-	                    return this.style('font-family');
+	                    return this.m_font;
 	                }
@@ -265,2 +271,3 @@ /* setter */
 	                this.style('font-family', _fnt.getStyle());
+	                this.m_font = _fnt;
 	            } catch (e) {
@@ -283,5 +290,6 @@ console.error(e.stack);
 	                var _fnt = fnt === undefined ? null : fnt;
-	                if ('object' !== _fnt) {
+	                if ('object' !== (typeof _fnt === 'undefined' ? 'undefined' : _typeof(_fnt))) {
 	                    throw new Error('invalid parameter');
 	                }
+	                this.m_font = _fnt;
 	                this.target().addClname(fnt.getThemeClass());
@@ -296,5 +304,5 @@ } catch (e) {
 	    return _class;
-	}(mofron.comp.Base);
+	}(mofron.Component);
 
 /***/ }
 /******/ ]);

package.json

 {
   "name": "mofron-comp-text",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "text component for mofron",
@@ -5,0 +5,0 @@ "main": "dist/text.js",

src/text.js

@@ -6,7 +6,5 @@ /**
  */
-
-mofron.comp.Text = class extends mofron.comp.Base {
-    
+mofron.comp.Text = class extends mofron.Component {
     /**
-     * initialize font theme
+     * initialize text component
      *
@@ -18,6 +16,13 @@ * @param prm : (string) text contents
         try {
-            super(prm, opt);
+            super(prm);
+            this.setBaseName('Text');
             this.name('Text');
+            
             /* font theme */
             this.m_font = null;
+            
+            /* set option */
+            if (null !== opt) {
+                this.option(opt);
+            }
         } catch (e) {
@@ -50,6 +55,6 @@ console.error(e.stack);
             /* set font theme */
-            //this.m_theme.get('Font');
-            //if (null !== this.m_font) {
-            //    this.setFontTheme(this.m_font);
-            //}
+            var fnt = this.theme().getFont(0);
+            if (null !== fnt) {
+                this.setFontTheme(fnt);
+            }
         } catch (e) {
@@ -150,3 +155,3 @@ console.error(e.stack);
             if (null === _clr) {
-                return mofron.util.getColorObj(this.style('color'));
+                return mofron.func.getColorObj(this.style('color'));
             }
@@ -174,3 +179,3 @@ if ('object' !== (typeof _clr)) {
                 /* getter */
-                return this.style('font-family');
+                return this.m_font;
             }
@@ -182,2 +187,3 @@ /* setter */
             this.style('font-family', _fnt.getStyle());
+            this.m_font = _fnt;
         } catch (e) {
@@ -197,5 +203,6 @@ console.error(e.stack);
             var _fnt = (fnt === undefined) ? null : fnt;
-            if ('object' !== _fnt) {
+            if ('object' !== typeof _fnt) {
                 throw new Error('invalid parameter');
             }
+            this.m_font = _fnt;
             this.target().addClname(fnt.getThemeClass());
@@ -202,0 +209,0 @@ } catch (e) {

No alert changes

Improved metrics

Total package byte prevSize

18990

increased by2.49%

Lines of code

465

increased by3.1%

No dependency changes