Skip to content

Use Conductor Analytics card #23

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

Open
cyril-sf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use Conductor Analytics card #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions app/initializers/conductor_analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import analyticsCardBootstrap from "conductor/analytics/bootstrap";

var analyticsCard;

var initializer = {
name: 'conductorAnalytics',
before: 'conductorServices',

initialize: function (container, application) {
var sk = window.StarterKit;

if(sk) {
sk.wiretapCard = function(card) {
analyticsCard.track( card );
};

sk.initializeAnalytics = function(conductor) {
analyticsCard = analyticsCardBootstrap.initializeConductorAnalytics(
conductor,
'/vendor/conductor-analytics/card.js'
);
};

sk.insertAnalytics = function($analytics) {
analyticsCard.appendTo( $analytics );
analyticsCard.render();
};
}
}
};

export default initializer;
2 changes: 2 additions & 0 deletions app/initializers/conductor_services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ var initializer = {
conductor.removeDefaultCapability('height');
application.register('conductor:main', conductor, { instantiate: false });

if( window.StarterKit ) window.StarterKit.initializeAnalytics(conductor);

Ember.keys(requirejs._eak_seen).forEach(function (moduleName) {
var match = /^glazier\/services\/(.+)/.exec(moduleName);

Expand Down
2 changes: 2 additions & 0 deletions app/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Dashboard from 'glazier/models/dashboard';
import PaneView from 'glazier/views/pane';

import conductorServicesInitializer from 'glazier/initializers/conductor_services';
import conductorAnalyticsInitializer from 'glazier/initializers/conductor_analytics';
import injectionsInitializer from 'glazier/initializers/injections';

if (requirejs._eak_seen.ziniki) {
Expand Down Expand Up @@ -49,6 +50,7 @@ Glazier.PaneView = PaneView;
Glazier.env = (/github\.glazier\.io/.test(window.location.hostname)) ? 'prod' : 'dev';

Application.initializer(injectionsInitializer);
Application.initializer(conductorAnalyticsInitializer);
Application.initializer(conductorServicesInitializer);

Ember.RSVP.configure('onerror', function(error) {
Expand Down
2 changes: 1 addition & 1 deletion app/views/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var FooterView = Ember.View.extend({
elementId: "footer",
classNameBindings: ['controller.isDrawerOpen'],
didInsertElement: function() {
StarterKit.initializeAnalytics(this.$('.analytics'));
if( window.StarterKit ) StarterKit.insertAnalytics(this.$('.analytics .output')[0]);
}
});

Expand Down
7 changes: 2 additions & 5 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<script src="<%= manifestUrl('/vendor/ember-latest.js') %>"></script>
<script src="<%= manifestUrl('/vendor/ember-states.js') %>"></script>
<script src="<%= manifestUrl('/vendor/ember-data-latest.js') %>"></script>
<script src="<%= manifestUrl('/vendor/conductor-analytics/conductor-analytics-bootstrap.js') %>"></script>
<script src="<%= manifestUrl('/vendor/conductor.js.html') %>"></script>
<script src="<%= manifestUrl('/glazier.js') %>"></script>
<!--
Expand All @@ -25,6 +26,7 @@
</head>
<body>
<script>
var StarterKit = {};
window.Conductor = require('conductor');
window.Glazier = require('glazier/main').Glazier;
Glazier.manifest = <%= manifest %>;
Expand All @@ -33,10 +35,5 @@

<!-- Analytics -->
<link rel="stylesheet" href="<%= manifestUrl('/css/glazier.css') %>">

<script>
var StarterKit = {};
</script>
<script src="<%= manifestUrl('/vendor/analytics.js') %>"></script>
</body>
</html>
7 changes: 6 additions & 1 deletion stylesheets/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
background-color: rgba(0,0,0,0.8);
}

.analytics,
.output {
height: inherit;
}

&.is-drawer-open {
bottom:0;
}
Expand Down Expand Up @@ -155,4 +160,4 @@
color: #333;
}
}
}
}
1 change: 1 addition & 0 deletions test/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<script src="/vendor/ember-latest.js"></script>
<script src="/vendor/ember-states.js"></script>
<script src="/vendor/ember-data-latest.js"></script>
<script src="/vendor/conductor-analytics/conductor-analytics-bootstrap.js"></script>
<script src="/vendor/conductor.js.html"></script>
<script src="/vendor/qunit.js"></script>
<script src="/glazier.js"></script>
Expand Down
189 changes: 0 additions & 189 deletions vendor/analytics.js
View file
Open in desktop

This file was deleted.

Loading