Skip to content

Commit

Permalink
performance tweaks and new notification views
Browse files Browse the repository at this point in the history
  • Loading branch information
@markharding
markharding committed Jul 10, 2015
1 parent 3f0f56c commit 730dc56
Show file tree
Hide file tree
Showing 13 changed files with 729 additions and 219 deletions.
28 changes: 14 additions & 14 deletions www/js/main-built.js
View file

Large diffs are not rendered by default.

36 changes: 34 additions & 2 deletions www/js/templates-compiled.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1539,7 +1539,7 @@ define(['angular'], function(angular){
"\n" +
" <ion-list>\n" +
"\n" +
" <activity-view ng-repeat=\"activity in newsfeedItems\" id=\"{{activity.guid}}\" class=\"activity-item list card\">\n" +
" <activity-view ng-repeat=\"activity in newsfeedItems track by $id(activity)\" id=\"{{activity.guid}}\" class=\"activity-item list card\">\n" +
" </activity-view>\n" +
"\n" +
" </ion-list>\n" +
Expand Down Expand Up @@ -1736,6 +1736,33 @@ define(['angular'], function(angular){
" </p>\n" +
" </a>\n" +
" </div>\n" +
" <!-- down voted content -->\n" +
" <div ng-switch-when=\"downvote\">\n" +
" <a href=\"#/tab/notifications/entity/{{notification.entityObj.guid}}\" ng-if=\"notification.entityObj.type == 'object'\">\n" +
" <p>{{notification.fromObj.name}} down voted \n" +
" <span class=\"minds-blue\" ng-if=\"notification.entityObj.title\" ng-bind-html=\"notification.entityObj.title\"></span>\n" +
" <span class=\"minds-blue\" ng-if=\"!notification.entityObj.title\">your {{notification.entityObj.subtype}}</span>\n" +
" </p>\n" +
" </a>\n" +
" <a href=\"#/tab/notifications/entity/{{notification.entityObj.guid}}\" ng-if=\"notification.entityObj.type == 'activity'\">\n" +
" <p ng-if=\"notification.entityObj.title\">\n" +
" {{notification.fromObj.name}} down voted <span class=\"minds-blue\" ng-bind-html=\"notification.entityObj.title\"></span>\n" +
" </p>\n" +
" <p ng-if=\"!notification.entityObj.title\">\n" +
" {{notification.fromObj.name}} down voted <span class=\"minds-blue\">your activity</span>\n" +
" </p>\n" +
" </a>\n" +
" <a href=\"#/tab/notifications/entity/{{notification.entityObj.parent_guid}}\" ng-if=\"notification.entityObj.type == 'comment'\">\n" +
" <p>\n" +
" {{notification.fromObj.name}} down voted <span class=\"minds-blue\"> your comment </span>\n" +
" </p>\n" +
" </a>\n" +
" <a href=\"#/tab/notifications/entity/{{notification.entityObj.guid}}\" ng-if=\"!notification.entityObj\">\n" +
" <p style=\"font-style:italic\">\n" +
" This post was deleted.\n" +
" </p>\n" +
" </a>\n" +
" </div>\n" +
" <!-- Remind --> \n" +
" <div ng-switch-when=\"remind\">\n" +
" <a href=\"#/tab/notifications/entity/{{notification.entityObj.guid}}\" ng-if=\"notification.entityObj.type == 'object'\">\n" +
Expand Down Expand Up @@ -1838,12 +1865,17 @@ define(['angular'], function(angular){
" have been met.</p>\n" +
" </a>\n" +
" </div>\n" +
" <!-- Points prompt -->\n" +
" <div ng-switch-when=\"custom_message\">\n" +
" <a>\n" +
" <p ng-bind-html=\"notification.params.message\"></p>\n" +
" </a>\n" +
" </div>\n" +
" <div ng-switch-when=\"welcome_points\">\n" +
" <a href=\"#/tab/newsfeed/wallet\">\n" +
" <p>Welcome to Minds. We have given you <span class=\"minds-blue\">100 points</span> to get you started.</p>\n" +
" </a>\n" +
" </div>\n" +
" \n" +
" <!-- tutorial/promts -->\n" +
" <div ng-switch-when=\"welcome_post\">\n" +
" <a href=\"#/tab/capture\">\n" +
Expand Down
2 changes: 1 addition & 1 deletion www/templates/newsfeed/list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ion-list>

<activity-view ng-repeat="activity in newsfeedItems" id="{{activity.guid}}" class="activity-item list card">
<activity-view ng-repeat="activity in newsfeedItems track by $id(activity)" id="{{activity.guid}}" class="activity-item list card">
</activity-view>

</ion-list>
Expand Down
34 changes: 33 additions & 1 deletion www/templates/notifications/list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,33 @@
</p>
</a>
</div>
<!-- down voted content -->
<div ng-switch-when="downvote">
<a href="#/tab/notifications/entity/{{notification.entityObj.guid}}" ng-if="notification.entityObj.type == 'object'">
<p>{{notification.fromObj.name}} down voted
<span class="minds-blue" ng-if="notification.entityObj.title" ng-bind-html="notification.entityObj.title"></span>
<span class="minds-blue" ng-if="!notification.entityObj.title">your {{notification.entityObj.subtype}}</span>
</p>
</a>
<a href="#/tab/notifications/entity/{{notification.entityObj.guid}}" ng-if="notification.entityObj.type == 'activity'">
<p ng-if="notification.entityObj.title">
{{notification.fromObj.name}} down voted <span class="minds-blue" ng-bind-html="notification.entityObj.title"></span>
</p>
<p ng-if="!notification.entityObj.title">
{{notification.fromObj.name}} down voted <span class="minds-blue">your activity</span>
</p>
</a>
<a href="#/tab/notifications/entity/{{notification.entityObj.parent_guid}}" ng-if="notification.entityObj.type == 'comment'">
<p>
{{notification.fromObj.name}} down voted <span class="minds-blue"> your comment </span>
</p>
</a>
<a href="#/tab/notifications/entity/{{notification.entityObj.guid}}" ng-if="!notification.entityObj">
<p style="font-style:italic">
This post was deleted.
</p>
</a>
</div>
<!-- Remind -->
<div ng-switch-when="remind">
<a href="#/tab/notifications/entity/{{notification.entityObj.guid}}" ng-if="notification.entityObj.type == 'object'">
Expand Down Expand Up @@ -188,12 +215,17 @@
have been met.</p>
</a>
</div>
<!-- Points prompt -->
<div ng-switch-when="custom_message">
<a>
<p ng-bind-html="notification.params.message"></p>
</a>
</div>
<div ng-switch-when="welcome_points">
<a href="#/tab/newsfeed/wallet">
<p>Welcome to Minds. We have given you <span class="minds-blue">100 points</span> to get you started.</p>
</a>
</div>

<!-- tutorial/promts -->
<div ng-switch-when="welcome_post">
<a href="#/tab/capture">
Expand Down
38 changes: 28 additions & 10 deletions www/vendors/ionic/css/ionic.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright 2014 Drifty Co.
* http://drifty.com/
*
* Ionic, v1.0.0
* Ionic, v1.0.1
* A powerful HTML5 mobile app framework.
* http://ionicframework.com/
*
Expand Down Expand Up @@ -2692,12 +2692,8 @@ ion-infinite-scroll {
color: #666666;
font-size: 30px;
color: #666666; }
ion-infinite-scroll .icon:before, ion-infinite-scroll .spinner {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); }
ion-infinite-scroll:not(.active) .spinner, ion-infinite-scroll:not(.active) .icon:before {
-webkit-transform: translate3d(-1000px, 0, 0);
transform: translate3d(-1000px, 0, 0); }
display: none; }

.overflow-scroll {
overflow-x: hidden;
Expand Down Expand Up @@ -3040,6 +3036,8 @@ a.subdued {
right: 0;
left: 0;
z-index: 9;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 5px;
width: 100%;
Expand Down Expand Up @@ -4105,6 +4103,13 @@ ion-tabs.tabs-color-active-dark .tab-item {
-ms-transition: color 0.2s ease;
-o-transition: color 0.2s ease;
transition: color 0.2s ease; }
.tabs-top.tabs-striped:not(.tabs-icon-left):not(.tabs-icon-top) .tab-item.tab-item-active .tab-title, .tabs-top.tabs-striped:not(.tabs-icon-left):not(.tabs-icon-top) .tab-item.tab-item-active i, .tabs-top.tabs-striped:not(.tabs-icon-left):not(.tabs-icon-top) .tab-item.active .tab-title, .tabs-top.tabs-striped:not(.tabs-icon-left):not(.tabs-icon-top) .tab-item.active i, .tabs-top.tabs-striped:not(.tabs-icon-left):not(.tabs-icon-top) .tab-item.activated .tab-title, .tabs-top.tabs-striped:not(.tabs-icon-left):not(.tabs-icon-top) .tab-item.activated i {
display: block;
margin-top: -1px; }
.tabs-top.tabs-striped.tabs-icon-left .tab-item {
margin-top: 1px; }
.tabs-top.tabs-striped.tabs-icon-left .tab-item.tab-item-active .tab-title, .tabs-top.tabs-striped.tabs-icon-left .tab-item.tab-item-active i, .tabs-top.tabs-striped.tabs-icon-left .tab-item.active .tab-title, .tabs-top.tabs-striped.tabs-icon-left .tab-item.active i, .tabs-top.tabs-striped.tabs-icon-left .tab-item.activated .tab-title, .tabs-top.tabs-striped.tabs-icon-left .tab-item.activated i {
margin-top: -0.1em; }

/* Allow parent element to have tabs-top */
/* If you change this, change platform.scss as well */
Expand Down Expand Up @@ -4160,11 +4165,11 @@ ion-tabs.tabs-color-active-dark .tab-item {

.tabs-icon-left.tabs .tab-item, .tabs-icon-left > .tabs .tab-item, .tabs-icon-right.tabs .tab-item, .tabs-icon-right > .tabs .tab-item {
font-size: 10px; }
.tabs-icon-left.tabs .tab-item .icon, .tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-right.tabs .tab-item .icon, .tabs-icon-right > .tabs .tab-item .icon {
.tabs-icon-left.tabs .tab-item .icon, .tabs-icon-left.tabs .tab-item .tab-title, .tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-left > .tabs .tab-item .tab-title, .tabs-icon-right.tabs .tab-item .icon, .tabs-icon-right.tabs .tab-item .tab-title, .tabs-icon-right > .tabs .tab-item .icon, .tabs-icon-right > .tabs .tab-item .tab-title {
display: inline-block;
vertical-align: top;
margin-top: -0.1em; }
.tabs-icon-left.tabs .tab-item .icon:before, .tabs-icon-left > .tabs .tab-item .icon:before, .tabs-icon-right.tabs .tab-item .icon:before, .tabs-icon-right > .tabs .tab-item .icon:before {
.tabs-icon-left.tabs .tab-item .icon:before, .tabs-icon-left.tabs .tab-item .tab-title:before, .tabs-icon-left > .tabs .tab-item .icon:before, .tabs-icon-left > .tabs .tab-item .tab-title:before, .tabs-icon-right.tabs .tab-item .icon:before, .tabs-icon-right.tabs .tab-item .tab-title:before, .tabs-icon-right > .tabs .tab-item .icon:before, .tabs-icon-right > .tabs .tab-item .tab-title:before {
font-size: 24px;
line-height: 49px; }

Expand Down Expand Up @@ -4618,7 +4623,7 @@ ion-tabs.tabs-color-active-dark .tab-item {
transition: 0.2s opacity linear;
visibility: hidden;
opacity: 0; }
.loading-container:not(.visible) .icon {
.loading-container:not(.visible) .icon, .loading-container:not(.visible) .spinner {
display: none; }
.loading-container.visible {
visibility: visible; }
Expand Down Expand Up @@ -4787,7 +4792,7 @@ a.item {
z-index: 2;
padding: 16px 49px 16px 16px;
border: none;
background-color: white; }
background-color: #fff; }

a.item-content {
display: block;
Expand Down Expand Up @@ -6983,6 +6988,9 @@ a.button {
border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }

.button-bar > .button-small:before, .button-bar > .button-small .icon:before {
line-height: 28px; }

/**
* Grid
* --------------------------------------------------
Expand Down Expand Up @@ -7524,6 +7532,16 @@ a.button {
top: 113px; }
.platform-ios.platform-cordova:not(.fullscreen) .has-header.has-subheader.has-tabs-top {
top: 157px; }
.platform-ios.platform-cordova .popover .bar-header:not(.bar-subheader) {
height: 44px; }
.platform-ios.platform-cordova .popover .bar-header:not(.bar-subheader).item-input-inset .item-input-wrapper {
margin-top: -1px; }
.platform-ios.platform-cordova .popover .bar-header:not(.bar-subheader) > * {
margin-top: 0; }
.platform-ios.platform-cordova .popover .has-header, .platform-ios.platform-cordova .popover .bar-subheader {
top: 44px; }
.platform-ios.platform-cordova .popover .has-subheader {
top: 88px; }
.platform-ios.platform-cordova.status-bar-hide {
margin-bottom: 20px; }

Expand Down
4 changes: 2 additions & 2 deletions www/vendors/ionic/css/ionic.min.css
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 730dc56

Please sign in to comment.