Repository: incubator-zeppelin Updated Branches: refs/heads/master 669897d46 -> 7465a2641
Replace button to div in scatter settings This PR fixes same issue as [ZEPPELIN-351](https://issues.apache.org/jira/browse/ZEPPELIN-351?jql=project%20%3D%20ZEPPELIN) which Firefox/IE users cannot remove fields from pivot settings for scatter chart. Author: Mina Lee <[email protected]> Closes #358 from minahlee/fix/removeFieldsFromScatterSetting and squashes the following commits: 3a6e58f [Mina Lee] Replace button to div in scatter settings Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/7465a264 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/7465a264 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/7465a264 Branch: refs/heads/master Commit: 7465a2641e1b5658b4ce6ccd4dea50d4cf89bbe3 Parents: 669897d Author: Mina Lee <[email protected]> Authored: Thu Oct 22 12:55:40 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Fri Oct 23 11:56:44 2015 +0900 ---------------------------------------------------------------------- .../src/app/notebook/paragraph/paragraph.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/7465a264/zeppelin-web/src/app/notebook/paragraph/paragraph.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.html b/zeppelin-web/src/app/notebook/paragraph/paragraph.html index 4324f34..78c240f 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.html +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.html @@ -248,9 +248,9 @@ limitations under the License. class="list-unstyled" style="height:36px"> <li ng-if="paragraph.config.graph.scatter.xAxis"> - <button class="btn btn-primary btn-xs"> + <div class="btn btn-primary btn-xs"> {{paragraph.config.graph.scatter.xAxis.name}} <span class="fa fa-close" ng-click="removeScatterOptionXaxis($index)"></span> - </button> + </div> </li> </ul> </span> @@ -264,9 +264,9 @@ limitations under the License. class="list-unstyled" style="height:36px"> <li ng-if="paragraph.config.graph.scatter.yAxis"> - <button class="btn btn-success btn-xs"> + <div class="btn btn-success btn-xs"> {{paragraph.config.graph.scatter.yAxis.name}} <span class="fa fa-close" ng-click="removeScatterOptionYaxis($index)"></span> - </button> + </div> </li> </ul> </span> @@ -280,9 +280,9 @@ limitations under the License. class="list-unstyled" style="height:36px"> <li ng-if="paragraph.config.graph.scatter.group"> - <button class="btn btn-info btn-xs"> + <div class="btn btn-info btn-xs"> {{paragraph.config.graph.scatter.group.name}} <span class="fa fa-close" ng-click="removeScatterOptionGroup($index)"></span> - </button> + </div> </li> </ul> </span> @@ -302,9 +302,9 @@ limitations under the License. class="list-unstyled" style="height:36px"> <li ng-if="paragraph.config.graph.scatter.size"> - <button class="btn btn-xs" style="color:white" ng-class="{'btn-warning': isValidSizeOption(paragraph.config.graph.scatter, paragraph.result.rows)}"> + <div class="btn btn-xs" style="color:white" ng-class="{'btn-warning': isValidSizeOption(paragraph.config.graph.scatter, paragraph.result.rows)}"> {{paragraph.config.graph.scatter.size.name}} <span class="fa fa-close" ng-click="removeScatterOptionSize($index)"></span> - </button> + </div> </li> </ul> </span>
