Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove nicescroll #1621

Merged
merged 2 commits into from
Nov 4, 2018
Merged

remove nicescroll #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5034a
remove nicescroll
codepiano Oct 24, 2018
ae7cb96
Merge branch 'master' into remove_nicescroll_plugin
nobodyiam Nov 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apollo-portal/src/main/resources/static/app/setting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ <h4>您没有权限操作，请找 [{{admins.join(',')}}] 开通权限</h4>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>
<script src="../vendor/lodash.min.js"></script>

<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
Expand Down
3 changes: 0 additions & 3 deletions apollo-portal/src/main/resources/static/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,6 @@ <h4 class="modal-title">创建灰度须知</h4>
<!--lodash.js-->
<script src="vendor/lodash.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="vendor/jquery.nicescroll.min.js"></script>

<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
Expand Down
3 changes: 0 additions & 3 deletions apollo-portal/src/main/resources/static/config/history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,6 @@ <h4 class="text-center empty-container" ng-show="!isConfigHidden">无发布历
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>

<script src="../vendor/diff.min.js" type="text/javascript"></script>

<!--biz-->
Expand Down
3 changes: 0 additions & 3 deletions apollo-portal/src/main/resources/static/config/sync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,6 @@ <h3>同步失败!</h3>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>

<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions apollo-portal/src/main/resources/static/delete_app_cluster_namespace.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ <h4>当前页面只对Apollo管理员开放</h4>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>
<script src="../vendor/lodash.min.js"></script>

<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
Expand Down
3 changes: 0 additions & 3 deletions apollo-portal/src/main/resources/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ <h5 ng-bind="app.name"></h5>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="vendor/jquery.nicescroll.min.js"></script>

<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
Expand Down
3 changes: 0 additions & 3 deletions apollo-portal/src/main/resources/static/namespace/role.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ <h2>您没有权限哟!</h2>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>

<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>

<!--biz-->
Expand Down
2 changes: 0 additions & 2 deletions apollo-portal/src/main/resources/static/open/manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ <h4>当前页面只对Apollo管理员开放</h4>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>
<script src="../vendor/lodash.min.js"></script>

<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
Expand Down
18 changes: 0 additions & 18 deletions apollo-portal/src/main/resources/static/scripts/PageCommon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,13 @@
$(document).ready(function () {

// nicescroll
$("html").niceScroll({
styler: "fb",
cursorcolor: "#e8403f",
cursorwidth: '6',
cursorborderradius: '10px',
background: '#404040',
spacebarenabled: false,
cursorborder: '',
zindex: '1000'
});

// bootstrap tooltip & textarea scroll
setInterval(function () {
$('[data-tooltip="tooltip"]').tooltip({
trigger : 'hover'
});
$("textarea").niceScroll({cursoropacitymax: 0});
$("pre").niceScroll({cursoropacitymax: 0});
}, 1000);

setTimeout(function () {

$(".release-history-list").niceScroll({cursoropacitymax: 0});

}, 2500);
});

// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423
Expand Down
2 changes: 0 additions & 2 deletions apollo-portal/src/main/resources/static/system_info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ <h4>当前页面只对Apollo管理员开放</h4>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>
<script src="../vendor/lodash.min.js"></script>

<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
Expand Down
Loading