Merge pull request #6 from learning-layers/integration

Integration
learning-layers · Nov 26, 2014 · 8c91348 · 8c91348
2 parents a2c689d + b899dac
commit 8c91348
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/css/style.css b/css/style.css
@@ -543,3 +543,7 @@ label.notBoldLabel {
 	position: relative;
 }
 
+.widgetHidden {
+	display: none;
+}
+
diff --git a/js/view/AppView.js b/js/view/AppView.js
@@ -102,7 +102,6 @@ define(['logger', 'tracker', 'backbone', 'jquery', 'voc','underscore',
                     tagName: 'fieldset',
                     circleRenameModalView: this.circleRenameModalView
                 });
-
                 if( widgetView.isBrowse() ) {
                     versionElem.prepend(widgetView.$el);
                 }else if( widgetView.isOrganize() ) {
@@ -143,7 +142,7 @@ define(['logger', 'tracker', 'backbone', 'jquery', 'voc','underscore',
                 if( version === this.model.get(Voc.currentVersion)) {
                     this.show(version);
                 } else {
-                    versionElem.css('visibility', 'hidden');
+                    versionElem.addClass('widgetHidden');
                 }
             },
             show: function(version) {
@@ -156,13 +155,23 @@ define(['logger', 'tracker', 'backbone', 'jquery', 'voc','underscore',
                 AppLog.debug('showing', version.getSubject());
 
                 var that= this;
-                this.widgetFrame.children().css('visibility', 'hidden');
+                this.widgetFrame.children().addClass('widgetHidden');
                 AppLog.debug('hide' , this.widgetFrame.children());
                 var element = this.widgetFrame.children('*[about="'+version.getSubject()+'"]');
-                element.css('visibility', 'visible');
+                element.removeClass('widgetHidden');
                 element.detach();
                 this.widgetFrame.prepend(element);
 
+                // This force redraws current timeline element.
+                // This happends due to elements being hidden initially.
+                _.each(this.widgetViews, function(widget) {
+                    if ( widget.model.get(Voc.belongsToVersion) === version ) {
+                        if ( widget.isBrowse() && widget.view.timeline ) {
+                            widget.view.timeline.redraw();
+                        }
+                    }
+                });
+
             },
             browseCurrentBrowseWidget: function(entity) {
                 var version = this.model.get(Voc.currentVersion);

diff --git a/js/view/LoginFormView.js b/js/view/LoginFormView.js
@@ -85,7 +85,11 @@ define(['module', 'logger', 'underscore', 'jquery', 'backbone', 'voc', 'UserAuth
                 return false;
             }
 
-            var url = this.oidcAuthorizationUrl + '?response_type=' + encodeURIComponent('id_token token') + '&client_id=' + this.oidcClientID + '&scope=' + encodeURIComponent('openid email profile');
+            var url = this.oidcAuthorizationUrl
+                + '?response_type=' + encodeURIComponent('id_token token')
+                + '&client_id=' + this.oidcClientID
+                + '&scope=' + encodeURIComponent('openid email profile')
+                + '&redirect_uri=' + encodeURIComponent(window.location.origin + window.location.pathname);
 
             window.location.href = url;
         },