Ref: clean code

Ref: update examples
This commit is contained in:
Lorenzo Iovino 2019-05-06 10:21:16 +02:00
parent 43d4cf66f4
commit ca1576015d
6 changed files with 196 additions and 198 deletions

337
.idea/workspace.xml generated
View file

@ -4,19 +4,13 @@
<bookmark url="file://$PROJECT_DIR$/examples/dev/src/app/app.component.html" line="0" /> <bookmark url="file://$PROJECT_DIR$/examples/dev/src/app/app.component.html" line="0" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6d9e6998-eced-4f47-8fb4-3257db3e18e7" name="Default" comment=""> <list default="true" id="6d9e6998-eced-4f47-8fb4-3257db3e18e7" name="Default" comment="Ref: clean code">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/dist/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/examples/dev/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/examples/dev/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/examples/dev/src/app/app.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/examples/dev/src/app/app.component.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/examples/dev/src/app/app.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/examples/dev/src/app/app.component.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/examples/dev/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/examples/dev/src/app/app.module.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts" beforeDir="false" afterPath="$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts" beforeDir="false" afterPath="$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/publishPackage.json" beforeDir="false" afterPath="$PROJECT_DIR$/publishPackage.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/publishPackage.json" beforeDir="false" afterPath="$PROJECT_DIR$/publishPackage.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/distPackage.json" beforeDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
@ -89,54 +83,57 @@
<session id="-1436062187"> <session id="-1436062187">
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <counts>
<entry key="project.closed" value="5" /> <entry key="project.closed" value="7" />
<entry key="project.open.time.0" value="3" /> <entry key="project.open.time.0" value="4" />
<entry key="project.open.time.1" value="2" /> <entry key="project.open.time.1" value="2" />
<entry key="project.open.time.8" value="1" /> <entry key="project.open.time.8" value="2" />
<entry key="project.open.time.9" value="1" /> <entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="7" /> <entry key="project.opened" value="9" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.js.language.service.starts"> <usages-collector id="statistics.js.language.service.starts">
<counts> <counts>
<entry key="Angular2LanguageService" value="5" /> <entry key="Angular2LanguageService" value="7" />
<entry key="TypeScriptServerServiceImpl" value="1" /> <entry key="TypeScriptServerServiceImpl" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="html" value="87" /> <entry key="css" value="14" />
<entry key="json" value="203" /> <entry key="html" value="212" />
<entry key="json" value="205" />
<entry key="md" value="84" /> <entry key="md" value="84" />
<entry key="ts" value="151" /> <entry key="ts" value="284" />
<entry key="txt" value="18" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="HTML" value="87" /> <entry key="CSS" value="14" />
<entry key="JSON" value="203" /> <entry key="HTML" value="212" />
<entry key="PLAIN_TEXT" value="84" /> <entry key="JSON" value="205" />
<entry key="TypeScript" value="151" /> <entry key="PLAIN_TEXT" value="102" />
<entry key="TypeScript" value="284" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="css" value="1" /> <entry key="css" value="2" />
<entry key="html" value="2" /> <entry key="html" value="4" />
<entry key="js" value="3" /> <entry key="js" value="3" />
<entry key="json" value="11" /> <entry key="json" value="13" />
<entry key="md" value="4" /> <entry key="md" value="4" />
<entry key="ts" value="5" /> <entry key="ts" value="9" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="CSS" value="1" /> <entry key="CSS" value="2" />
<entry key="HTML" value="2" /> <entry key="HTML" value="4" />
<entry key="JSON" value="11" /> <entry key="JSON" value="13" />
<entry key="JavaScript" value="3" /> <entry key="JavaScript" value="3" />
<entry key="PLAIN_TEXT" value="4" /> <entry key="PLAIN_TEXT" value="4" />
<entry key="TypeScript" value="5" /> <entry key="TypeScript" value="9" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
@ -144,10 +141,13 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="408">
<caret line="25" column="15" lean-forward="true" selection-end-line="133" /> <caret line="27" column="36" lean-forward="true" selection-end-line="131" />
<folding>
<element signature="e#0#154#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -155,48 +155,55 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json"> <entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629"> <state relative-caret-position="68">
<caret line="37" column="38" selection-start-line="37" selection-start-column="38" selection-end-line="37" selection-end-column="38" /> <caret line="4" column="41" lean-forward="true" selection-start-line="4" selection-start-column="41" selection-end-line="4" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/package.json"> <entry file="file://$PROJECT_DIR$/examples/dev/package.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/directives/ng2-fittext.directive.js"> <entry file="file://$PROJECT_DIR$/examples/dev/src/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.css">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dist/README.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="107" column="61" lean-forward="true" selection-start-line="107" selection-start-column="61" selection-end-line="107" selection-end-column="61" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="39" selection-start-line="17" selection-start-column="39" selection-end-line="17" selection-end-column="39" />
<folding>
<element signature="e#0#154#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts"> <entry file="file://$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544"> <state relative-caret-position="1870">
<caret line="32" column="46" selection-start-line="32" selection-start-column="46" selection-end-line="32" selection-end-column="46" /> <caret line="110" column="5" lean-forward="true" selection-start-line="110" selection-start-column="5" selection-end-line="110" selection-end-column="5" />
<folding> <folding>
<element signature="e#0#154#0" expanded="true" /> <element signature="e#0#154#0" expanded="true" />
</folding> </folding>
@ -205,13 +212,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ng2-fittext.module.ts"> <entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="85">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> <caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
<folding>
<element signature="e#0#73#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -228,8 +232,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/publishPackage.json"> <entry file="file://$PROJECT_DIR$/publishPackage.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="374">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" /> <caret line="22" column="17" lean-forward="true" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -257,8 +261,11 @@
<find>tar</find> <find>tar</find>
<find>maxFontSize</find> <find>maxFontSize</find>
<find>useMax</find> <find>useMax</find>
<find>use</find>
<find>useFont</find> <find>useFont</find>
<find>use</find>
<find>useMA</find>
<find>console</find>
<find>this.maxFontSize</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>Ngx</replace> <replace>Ngx</replace>
@ -286,13 +293,14 @@
<option value="$PROJECT_DIR$/src/ng2-fittext.module.ts" /> <option value="$PROJECT_DIR$/src/ng2-fittext.module.ts" />
<option value="$PROJECT_DIR$/examples/dev/package.json" /> <option value="$PROJECT_DIR$/examples/dev/package.json" />
<option value="$PROJECT_DIR$/examples/dev/src/app/app.module.ts" /> <option value="$PROJECT_DIR$/examples/dev/src/app/app.module.ts" />
<option value="$PROJECT_DIR$/examples/dev/src/app/app.component.html" />
<option value="$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts" />
<option value="$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/dist/README.md" />
<option value="$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts" />
<option value="$PROJECT_DIR$/examples/dev/src/app/app.component.html" />
<option value="$PROJECT_DIR$/package.json" /> <option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/publishPackage.json" /> <option value="$PROJECT_DIR$/publishPackage.json" />
<option value="$PROJECT_DIR$/dist/README.md" /> <option value="$PROJECT_DIR$/examples/dev/src/app/app.component.css" />
<option value="$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts" />
</list> </list>
</option> </option>
</component> </component>
@ -325,7 +333,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -338,12 +345,6 @@
<item name="ng2-fittext" type="462c0819:PsiDirectoryNode" /> <item name="ng2-fittext" type="462c0819:PsiDirectoryNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" /> <item name="dist" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="ng2-fittext" type="b2602c69:ProjectViewProjectNode" />
<item name="ng2-fittext" type="462c0819:PsiDirectoryNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" />
<item name="directives" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="ng2-fittext" type="b2602c69:ProjectViewProjectNode" /> <item name="ng2-fittext" type="b2602c69:ProjectViewProjectNode" />
<item name="ng2-fittext" type="462c0819:PsiDirectoryNode" /> <item name="ng2-fittext" type="462c0819:PsiDirectoryNode" />
@ -362,6 +363,14 @@
<item name="dev" type="462c0819:PsiDirectoryNode" /> <item name="dev" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="ng2-fittext" type="b2602c69:ProjectViewProjectNode" />
<item name="ng2-fittext" type="462c0819:PsiDirectoryNode" />
<item name="examples" type="462c0819:PsiDirectoryNode" />
<item name="dev" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="ng2-fittext" type="b2602c69:ProjectViewProjectNode" /> <item name="ng2-fittext" type="b2602c69:ProjectViewProjectNode" />
<item name="ng2-fittext" type="462c0819:PsiDirectoryNode" /> <item name="ng2-fittext" type="462c0819:PsiDirectoryNode" />
@ -377,6 +386,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -389,7 +399,7 @@
<property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" /> <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" /> <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
<property name="ts.external.directory.path" value="C:\Users\Lorenzo\work\ng2-fittext\examples\dev\node_modules\typescript\lib" /> <property name="ts.external.directory.path" value="C:\Users\Lorenzo\work\ng2-fittext\node_modules\typescript\lib" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
@ -409,7 +419,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="npm.publish"> <component name="RunManager" selected="npm.start">
<configuration name="build" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
@ -440,13 +450,25 @@
<envs /> <envs />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="start" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/examples/dev/package.json" />
<command value="run" />
<scripts>
<script value="start" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
<list> <list>
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.prepublish" /> <item itemvalue="npm.prepublish" />
<item itemvalue="npm.publish" /> <item itemvalue="npm.publish" />
<item itemvalue="npm.start" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.start" />
<item itemvalue="npm.publish" /> <item itemvalue="npm.publish" />
<item itemvalue="npm.prepublish" /> <item itemvalue="npm.prepublish" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
@ -474,12 +496,14 @@
<workItem from="1549407784543" duration="212000" /> <workItem from="1549407784543" duration="212000" />
<workItem from="1549461075124" duration="28000" /> <workItem from="1549461075124" duration="28000" />
<workItem from="1556891010603" duration="1687000" /> <workItem from="1556891010603" duration="1687000" />
<workItem from="1556894975082" duration="972000" /> <workItem from="1556894975082" duration="1273000" />
<workItem from="1556896924237" duration="1342000" />
<workItem from="1557129355293" duration="1483000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="13357000" /> <option name="totallyTimeSpent" value="16483000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" /> <frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" />
@ -491,7 +515,7 @@
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32917467" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32917467" />
<window_info anchor="bottom" id="Run" order="2" weight="0.24184261" /> <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.24184261" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@ -577,9 +601,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/node_modules/ng2-fittext/directives/ng2-fittext.directive.js"> <entry file="file://$PROJECT_DIR$/examples/dev/node_modules/ng2-fittext/directives/ng2-fittext.directive.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544"> <state relative-caret-position="544">
@ -600,65 +621,44 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/examples/dev/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.module.ts"> <entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.module.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="170">
<caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding>
<element signature="e#0#58#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.html"> <entry file="file://$PROJECT_DIR$/src/distPackage.json" />
<entry file="file://$PROJECT_DIR$/examples/dev/package-lock.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102"> <state relative-caret-position="425">
<caret line="6" selection-start-line="6" selection-end-line="6" /> <caret line="25" column="15" selection-end-line="133" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts"> <entry file="file://$PROJECT_DIR$/dist/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544"> <state relative-caret-position="306">
<caret line="32" column="46" selection-start-line="32" selection-start-column="46" selection-end-line="32" selection-end-column="46" /> <caret line="18" column="21" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" />
<folding>
<element signature="e#0#154#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/publishPackage.json"> <entry file="file://$PROJECT_DIR$/dist/directives/ng2-fittext.directive.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dist/README.md">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="1989">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" /> <caret line="117" column="30" selection-start-line="117" selection-start-column="30" selection-end-line="117" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/ng2-fittext.module.ts"> <entry file="file://$PROJECT_DIR$/src/ng2-fittext.module.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="255">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
<folding> <folding>
<element signature="e#0#73#0" expanded="true" /> <element signature="e#0#73#0" expanded="true" />
@ -673,50 +673,81 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/distPackage.json"> <entry file="file://$PROJECT_DIR$/examples/dev/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="459">
<caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> <caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/examples/dev/package-lock.json"> <entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/node_modules/@angular/core/src/linker/element_ref.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="41" column="4" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="41" lean-forward="true" selection-start-line="4" selection-start-column="41" selection-end-line="4" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/publishPackage.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="17" lean-forward="true" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.css">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/app.component.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts"> <entry file="file://$PROJECT_DIR$/examples/dev/src/app/ng2-fittext.directive.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="408">
<caret line="17" column="39" selection-start-line="17" selection-start-column="39" selection-end-line="17" selection-end-column="39" /> <caret line="27" column="36" lean-forward="true" selection-end-line="131" />
<folding> <folding>
<element signature="e#0#154#0" expanded="true" /> <element signature="e#0#154#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/package.json"> <entry file="file://$PROJECT_DIR$/src/directives/ng2-fittext.directive.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629"> <state relative-caret-position="1870">
<caret line="37" column="38" selection-start-line="37" selection-start-column="38" selection-end-line="37" selection-end-column="38" /> <caret line="110" column="5" lean-forward="true" selection-start-line="110" selection-start-column="5" selection-end-line="110" selection-end-column="5" />
</state> <folding>
</provider> <element signature="e#0#154#0" expanded="true" />
</entry> </folding>
<entry file="file://$PROJECT_DIR$/dist/directives/ng2-fittext.directive.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dist/package.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="25" column="15" lean-forward="true" selection-end-line="133" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/README.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="107" column="61" lean-forward="true" selection-start-line="107" selection-start-column="61" selection-end-line="107" selection-end-column="61" />
</state> </state>
</provider> </provider>
</entry> </entry>

View file

@ -1,4 +1,4 @@
<h2>Add text or remove text from div</h2> <h2>Add text or remove text from div (max and min font size)</h2>
<div style="border: 2px solid; overflow:hidden; width:100%; height:300px; font-size:520px;"> <div style="border: 2px solid; overflow:hidden; width:100%; height:300px; font-size:520px;">
<div [fittext]="true" <div [fittext]="true"
[modelToWatch]="title" [modelToWatch]="title"
@ -7,8 +7,17 @@
[activateOnResize]="true">{{title}}</div> [activateOnResize]="true">{{title}}</div>
</div> </div>
<h2>Add text or remove text from div (no max and no min font size)</h2>
<div style="border: 2px solid; overflow:hidden; width:100%; height:300px; font-size:520px;">
<div [fittext]="true"
[modelToWatch]="title"
[activateOnResize]="true">{{title}}</div>
</div>
<button (click)="click('add')"> ADD text</button> <button (click)="click('add')"> ADD text</button>
<button (click)="click('remove')"> REMOVE text</button> <button (click)="click('remove')"> REMOVE text</button>
<br/> <br/>
<br/> <br/>
<h2>Write text in input box (text fit inside without overflowing)</h2> <h2>Write text in input box (text fit inside without overflowing)</h2>

View file

@ -31,7 +31,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
setFontSize(fontSize: number) { setFontSize(fontSize: number) {
if (this.isVisible() && !this.done) { if (this.isVisible() && !this.done) {
if (fontSize < this.minFontSize) { if (fontSize < this.minFontSize) {
// force that font size will never be lower than minimal allowed font size
fontSize = this.minFontSize; fontSize = this.minFontSize;
} }
if(fontSize > this.maxFontSize){ if(fontSize > this.maxFontSize){
@ -44,7 +43,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
} }
calculateFontSize(fontSize: number, speed: number) { calculateFontSize(fontSize: number, speed: number) {
// TODO Do with Gauss
return Math.floor(fontSize / speed); return Math.floor(fontSize / speed);
} }
@ -79,14 +77,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
ngOnInit() { ngOnInit() {
this.done = false; this.done = false;
const fontSize = this.getComputetStyle().fontSize;
if (fontSize) {
this.maxFontSize = parseInt(fontSize, undefined);
}
if (this.fittext) {
this.setFontSize(this.maxFontSize);
}
this.el.nativeElement.style.setProperty('will-change', 'content'); this.el.nativeElement.style.setProperty('will-change', 'content');
this.ngAfterViewInit(); this.ngAfterViewInit();
} }
@ -103,13 +93,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
this.ngAfterViewInit(); this.ngAfterViewInit();
} }
} else { } else {
if (this.fontSize > this.maxFontSize) {
const fontSize = this.getComputetStyle().fontSize;
if (fontSize) {
this.maxFontSize = parseInt(fontSize, undefined);
this.setFontSize(this.maxFontSize);
}
}
this.done = true; this.done = true;
} }
} }
@ -134,10 +117,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
} }
} }
private getComputetStyle(): CSSStyleDeclaration {
return window.getComputedStyle(this.container ? this.container : this.el.nativeElement.parentElement);
}
private getStartFontSizeFromHeight(): number { private getStartFontSizeFromHeight(): number {
return this.container ? this.container.clientHeight : this.el.nativeElement.parentElement.clientHeight; return this.container ? this.container.clientHeight : this.el.nativeElement.parentElement.clientHeight;
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "ng2-fittext", "name": "ng2-fittext",
"version": "1.2.3", "version": "1.2.4",
"description": "Ng2 Fittext, an Angular library", "description": "Ng2 Fittext, an Angular library",
"main": "./bundles/ng2-fittext.umd.js", "main": "./bundles/ng2-fittext.umd.js",
"module": "./ng2-fittext.es5.js", "module": "./ng2-fittext.es5.js",

View file

@ -1,6 +1,6 @@
{ {
"name": "ng2-fittext", "name": "ng2-fittext",
"version": "1.2.3", "version": "1.2.4",
"description": "Ng2-fittext: An Angular2+ directive that change the font size until it fit the upper level container dimension.", "description": "Ng2-fittext: An Angular2+ directive that change the font size until it fit the upper level container dimension.",
"main": "./bundles/ng2-fittext.umd.js", "main": "./bundles/ng2-fittext.umd.js",
"module": "./ng2-fittext.es5.js", "module": "./ng2-fittext.es5.js",

View file

@ -31,7 +31,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
setFontSize(fontSize: number) { setFontSize(fontSize: number) {
if (this.isVisible() && !this.done) { if (this.isVisible() && !this.done) {
if (fontSize < this.minFontSize) { if (fontSize < this.minFontSize) {
// force that font size will never be lower than minimal allowed font size
fontSize = this.minFontSize; fontSize = this.minFontSize;
} }
if(fontSize > this.maxFontSize){ if(fontSize > this.maxFontSize){
@ -44,7 +43,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
} }
calculateFontSize(fontSize: number, speed: number) { calculateFontSize(fontSize: number, speed: number) {
// TODO Do with Gauss
return Math.floor(fontSize / speed); return Math.floor(fontSize / speed);
} }
@ -79,14 +77,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
ngOnInit() { ngOnInit() {
this.done = false; this.done = false;
const fontSize = this.getComputetStyle().fontSize;
if (fontSize) {
this.maxFontSize = parseInt(fontSize, undefined);
}
if (this.fittext) {
this.setFontSize(this.maxFontSize);
}
this.el.nativeElement.style.setProperty('will-change', 'content'); this.el.nativeElement.style.setProperty('will-change', 'content');
this.ngAfterViewInit(); this.ngAfterViewInit();
} }
@ -103,13 +93,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
this.ngAfterViewInit(); this.ngAfterViewInit();
} }
} else { } else {
if (this.fontSize > this.maxFontSize) {
const fontSize = this.getComputetStyle().fontSize;
if (fontSize) {
this.maxFontSize = parseInt(fontSize, undefined);
this.setFontSize(this.maxFontSize);
}
}
this.done = true; this.done = true;
} }
} }
@ -134,10 +117,6 @@ export class Ng2FittextDirective implements AfterViewInit, OnInit, OnChanges, Af
} }
} }
private getComputetStyle(): CSSStyleDeclaration {
return window.getComputedStyle(this.container ? this.container : this.el.nativeElement.parentElement);
}
private getStartFontSizeFromHeight(): number { private getStartFontSizeFromHeight(): number {
return this.container ? this.container.clientHeight : this.el.nativeElement.parentElement.clientHeight; return this.container ? this.container.clientHeight : this.el.nativeElement.parentElement.clientHeight;
} }