Merge remote-tracking branch 'upstream/develop'

MediaMath · May 25, 2017 · 14eb3f1 · 14eb3f1
2 parents 27534a7 + 023ccc3
commit 14eb3f1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 29 deletions.
diff --git a/src/shared/fonts/icon/icomoon.woff b/src/shared/fonts/icon/icomoon.woff
diff --git a/src/strand-icon/doc.json b/src/strand-icon/doc.json
@@ -75,6 +75,7 @@
 				"partial-include",
 				"partial",
 				"pause",
+				"pending",
 				"pie-chart",
 				"pixels",
 				"play",

diff --git a/src/strand-icon/example.html b/src/strand-icon/example.html
@@ -273,6 +273,10 @@
 		<strand-icon type="pause" width="32" height="32"></strand-icon>
 		<p>pause</p>
 	</li>
+	<li>
+		<strand-icon type="pending" width="32" height="32"></strand-icon>
+		<p>pending</p>
+	</li>
 	<li>
 		<strand-icon type="pie-chart" width="32" height="32"></strand-icon>
 		<p>pie-chart</p>

diff --git a/src/strand-icon/index.html b/src/strand-icon/index.html
@@ -330,6 +330,10 @@
 			<strand-icon type="pause" width="32" height="32" unresolved></strand-icon>
 			<p>pause</p>
 		</li>
+		<li>
+			<strand-icon type="pending" width="32" height="32"></strand-icon>
+			<p>pending</p>
+		</li>
 		<li>
 			<strand-icon type="pie-chart" width="32" height="32" unresolved></strand-icon>
 			<p>pie-chart</p>

diff --git a/src/strand-icon/strand-icon.scss b/src/strand-icon/strand-icon.scss
@@ -232,90 +232,93 @@
 .str-icn-pause:before {
   content: "\e943";
 }
-.str-icn-pie-chart:before {
+.str-icn-pending:before {
   content: "\e944";
 }
-.str-icn-pixel-user:before {
+.str-icn-pie-chart:before {
   content: "\e945";
 }
-.str-icn-pixels:before {
+.str-icn-pixel-user:before {
   content: "\e946";
 }
-.str-icn-play:before {
+.str-icn-pixels:before {
   content: "\e947";
 }
-.str-icn-player:before {
+.str-icn-play:before {
   content: "\e948";
 }
-.str-icn-plus:before {
+.str-icn-player:before {
   content: "\e949";
 }
-.str-icn-preview:before {
+.str-icn-plus:before {
   content: "\e94a";
 }
-.str-icn-question:before {
+.str-icn-preview:before {
   content: "\e94b";
 }
-.str-icn-quick-edit:before {
+.str-icn-question:before {
   content: "\e94c";
 }
-.str-icn-refresh:before {
+.str-icn-quick-edit:before {
   content: "\e94d";
 }
-.str-icn-reporting:before {
+.str-icn-refresh:before {
   content: "\e94e";
 }
-.str-icn-scatter-plot:before {
+.str-icn-reporting:before {
   content: "\e94f";
 }
-.str-icn-search:before {
+.str-icn-scatter-plot:before {
   content: "\e950";
 }
-.str-icn-site-list:before {
+.str-icn-search:before {
   content: "\e951";
 }
-.str-icn-sort:before {
+.str-icn-site-list:before {
   content: "\e952";
 }
-.str-icn-success:before {
+.str-icn-sort:before {
   content: "\e953";
 }
-.str-icn-supply-node:before {
+.str-icn-success:before {
   content: "\e954";
 }
-.str-icn-supply:before {
+.str-icn-supply-node:before {
   content: "\e955";
 }
-.str-icn-three-pas-adserver:before {
+.str-icn-supply:before {
   content: "\e956";
 }
-.str-icn-tools:before {
+.str-icn-three-pas-adserver:before {
   content: "\e957";
 }
-.str-icn-tracker:before {
+.str-icn-tools:before {
   content: "\e958";
 }
-.str-icn-unlock:before {
+.str-icn-tracker:before {
   content: "\e959";
 }
-.str-icn-up-arrow:before {
+.str-icn-unlock:before {
   content: "\e95a";
 }
-.str-icn-upload:before {
+.str-icn-up-arrow:before {
   content: "\e95b";
 }
-.str-icn-user:before {
+.str-icn-upload:before {
   content: "\e95c";
 }
-.str-icn-video:before {
+.str-icn-user:before {
   content: "\e95d";
 }
-.str-icn-warning:before {
+.str-icn-video:before {
   content: "\e95e";
 }
-.str-icn-wireless:before {
+.str-icn-warning:before {
   content: "\e95f";
 }
-.str-icn-xml:before {
+.str-icn-wireless:before {
   content: "\e960";
 }
+.str-icn-xml:before {
+  content: "\e961";
+}
diff --git a/src/strand-scroll-panel/strand-scroll-panel.js b/src/strand-scroll-panel/strand-scroll-panel.js
@@ -47,6 +47,7 @@
 		listeners: {
 			"added" : "_onAdded",
 			"removed" : "_onRemoved",
+			"modified": "_onModified",
 			"mouseenter" : "_onFocus"
 		},
 
@@ -62,6 +63,10 @@
 			this._updateScrollbarUI(0);
 		},
 
+		_onModified: function(e) {
+			this._updateScrollbarUI(0);
+		},
+
 		_onFocus: function(e) {
 			this._updateScrollbarUI(0);
 		},