Author: erinnp
Date: Fri Apr 12 15:56:35 2013
New Revision: 1467324
URL: http://svn.apache.org/r1467324
Log:
Rendering widgets
Removed:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/index.html
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal.html
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/tabs.html
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/controllers.js
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/directives.js
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_core.js
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal.html
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal.html?rev=1467324&r1=1467323&r2=1467324&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal.html
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal.html
Fri Apr 12 15:56:35 2013
@@ -14,7 +14,6 @@
</div>
</div>
<div class="logo-wrapper"></div>
-<div id="pageContent" class="container-fluid">
- <ng-include src="templateUrl"></ng-include>
+<div id="pageContent" class="container-fluid" ng-include="templateUrl">
</div>
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/tabs.html
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/tabs.html?rev=1467324&r1=1467323&r2=1467324&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/tabs.html
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/tabs.html
Fri Apr 12 15:56:35 2013
@@ -27,9 +27,8 @@
</nav>
<div class="row-fluid">
<div class="tab-content">
- <div ng-repeat="(regionIndex, region) in currentPage.regions"
ng-class="currentPage.pageLayoutCode">
+ <div ng-repeat="(regionIndex, region) in currentPage.regions"
ng-class="currentPage.pageLayoutCode+'_'+regionIndex" class="region
regionNonDragging">
<div ng-repeat="regionWidget in region.regionWidgets">
-
<div class="widget-wrapper">
<div class="widget-title-bar
widget-title-bar-draggable">
<div class="widget-toolbar-toggle-collapse"
title="Collapse/Restore Widget" style="">
@@ -89,8 +88,8 @@
</div>
<div class="widget-prefs"></div>
- <div class="widget">
- {{regionWidget.widgetUrl}}
+ <div class="widget" render-widget="regionWidget.id">
+
</div>
</div>
</div>
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/controllers.js
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/controllers.js?rev=1467324&r1=1467323&r2=1467324&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/controllers.js
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/controllers.js
Fri Apr 12 15:56:35 2013
@@ -10,6 +10,7 @@ angular.module('rave.controller', [])
pages.then(function(pages){
$scope.pages = pages;
setCurrentPage($routeParams.tabId);
+ registerWidgets();
});
function setCurrentPage(pageId) {
@@ -26,4 +27,14 @@ angular.module('rave.controller', [])
}
})
}
+
+ function registerWidgets(){
+ rave.init();
+ var widgets =
_.chain($scope.pages).pluck('regions').flatten().pluck('regionWidgets').flatten().value();
+ var i = 0;
+ _.each(widgets, function(widget){
+ widget.metadata = JSON.parse(widget.metadata);
+ rave.registerWidget(widget);
+ });
+ }
}]);
\ No newline at end of file
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/directives.js
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/directives.js?rev=1467324&r1=1467323&r2=1467324&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/directives.js
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/angular-portal/directives.js
Fri Apr 12 15:56:35 2013
@@ -1,4 +1,8 @@
angular.module('rave.directive', [])
- .directive('renderWidget', function(){
-
- });
\ No newline at end of file
+ .directive('renderWidget', ['rave', '$parse', function (rave, $parse) {
+ return function postLink(scope, el, attrs) {
+ var fn = $parse(attrs.renderWidget);
+ var renderWidgetId = fn(scope);
+ rave.getWidget(renderWidgetId).render(el[0]);
+ }
+ }]);
\ No newline at end of file
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_core.js
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_core.js?rev=1467324&r1=1467323&r2=1467324&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_core.js
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_core.js
Fri Apr 12 15:56:35 2013
@@ -56,23 +56,23 @@ _.extend(rave, (function () {
//TODO: until api can be updated, attach regionid as an attribute
on the widget so that we can filter on this
definition.regionId = regionId;
}
- regionWidgets[definition.regionWidgetId] = definition;
+ regionWidgets[definition.id] = definition;
if (INITIALIZED) {
- regionWidgets[definition.regionWidgetId] = new
rave.RegionWidget(definition)
+ regionWidgets[definition.id] = new rave.RegionWidget(definition)
}
- return regionWidgets[definition.regionWidgetId];
+ return regionWidgets[definition.id];
}
//uregister a regionwidget, identified by a RegionWidget object, a widget
definition, or just an id
exports.unregisterWidget = function (widget) {
- var regionWidgetId = widget.regionWidgetId || widget;
+ var id = widget.id || widget;
- delete regionWidgets[regionWidgetId];
+ delete regionWidgets[id];
}
- //get registered widget by regionWidgetId
- exports.getWidget = function (regionWidgetId) {
- return regionWidgets[regionWidgetId];
+ //get registered widget by id
+ exports.getWidget = function (id) {
+ return regionWidgets[id];
}
exports.getWidgets = function (filter) {
@@ -167,7 +167,7 @@ _.extend(rave, (function () {
INITIALIZED = true;
_.invoke(providers, 'init');
_.each(regionWidgets, function (definition) {
- regionWidgets[definition.regionWidgetId] = new
rave.RegionWidget(definition)
+ regionWidgets[definition.id] = new rave.RegionWidget(definition)
});
_.each(initHandlers, function (fn) {
fn();
