Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.
Colors
- Badge
- Blue
- Red
- Yellow
- Green
- Mint
- Mint
- Mint
- Mint
- Mint
- Mint
- Mint
+ Badge
+ Blue
+ Red
+ Yellow
+ Green
+ Mint
+ Mint
+ Mint
+ Mint
+ Mint
+ Mint
+ Mint
@@ -44,18 +44,18 @@ export class BadgeComponent implements ng.IComponentOptions {
Round
- badge
- blue
- red
- yellow
- green
- mint
- pastel
- blue-pastel
- red-pastel
- yellow-pastel
- green-pastel
- mint-pastel
+ badge
+ blue
+ red
+ yellow
+ green
+ mint
+ pastel
+ blue-pastel
+ red-pastel
+ yellow-pastel
+ green-pastel
+ mint-pastel
@@ -63,36 +63,36 @@ export class BadgeComponent implements ng.IComponentOptions {
Round
- 1
- 2
- 3
- 4
- 5
- 6
- 1
- 2
- 3
- 4
- 5
- 6
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
Round
- 1
- 2
- 3
- 4
- 5
- 6
- 1
- 2
- 3
- 4
- 5
- 6
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
-
+
- ![]()
-
-
-
+ ![]()
+
+
+
-
{{$ctrl.csTitle}}
-{{$ctrl.csSubtitle}}
+{{$ctrl.mdTitle}}
+{{$ctrl.mdSubtitle}}
-
-
-
-
+
-
+
-
+
*/
/**
@@ -218,8 +218,8 @@ export class CardMenuFooter implements ng.IDirective {
*
* @html
+
Excellent
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -499,8 +499,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
-
-
+
+
*/
@@ -521,9 +521,9 @@ export class CardMenuFooter implements ng.IDirective {
* @section block-layout
*
* @html
-
+
-
`;
public bindings = {
- csId: '<',
- csIndex: '
-
+
{{item.label}}
-
{{$ctrl.csTitle}}
+{{$ctrl.mdTitle}}
@@ -24,8 +24,8 @@ export class CardNumberComponent implements ng.IComponentOptions {
`;
public bindings = {
- csId: '<',
- csTitle: '<',
+ mdId: '<',
+ mdTitle: '<',
onRemoveFn: '&',
deleteAriaLabel: '@?',
};
diff --git a/angularjs/src/lib/components/cardnumber/index.ts b/angularjs/src/lib/components/cardnumber/index.ts
index be7d8da234..367be34e5e 100644
--- a/angularjs/src/lib/components/cardnumber/index.ts
+++ b/angularjs/src/lib/components/cardnumber/index.ts
@@ -2,6 +2,6 @@ import * as angular from 'angular';
import { CardNumberComponent } from './cardnumber.component';
export default angular
- .module('collab.ui.card-number', [])
- .component('csCardNumber', new CardNumberComponent())
+ .module('momentum.ui.card-number', [])
+ .component('mdCardNumber', new CardNumberComponent())
.name;
diff --git a/angularjs/src/lib/components/cards/card.component.ts b/angularjs/src/lib/components/cards/card.component.ts
index 540c2dfc75..1e752f05bc 100644
--- a/angularjs/src/lib/components/cards/card.component.ts
+++ b/angularjs/src/lib/components/cards/card.component.ts
@@ -5,7 +5,7 @@ import * as imagesLoaded from 'imagesloaded';
export class CardLayout implements ng.IDirective {
/**
- * Usage:
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -439,8 +439,8 @@ export class CardMenuFooter implements ng.IDirective {
View More
-
-
+
+
- Header
@@ -239,8 +239,8 @@ export class CardMenuFooter implements ng.IDirective { rump shoulder chicken frankfurter.Header
@@ -260,8 +260,8 @@ export class CardMenuFooter implements ng.IDirective { aliquip nostrud.Header
@@ -272,8 +272,8 @@ export class CardMenuFooter implements ng.IDirective { laboris. Duis salami ham, aliqua meatball officia sirloin consequat jowl ad.Header
@@ -292,8 +292,8 @@ export class CardMenuFooter implements ng.IDirective { ribs.Header
@@ -303,8 +303,8 @@ export class CardMenuFooter implements ng.IDirective { bacon incididunt nulla ham hock tenderloin. Esse culpa et sunt. Spare ribs swine cillum do commodo.Header
@@ -313,8 +313,8 @@ export class CardMenuFooter implements ng.IDirective {CARD 6 Does your lorem ipsum text long for something a little meatier? Give our generator a try… it’s tasty!
Header
@@ -339,8 +339,8 @@ export class CardMenuFooter implements ng.IDirective { est laboris meatball pork belly beef ribs.Header
@@ -354,8 +354,8 @@ export class CardMenuFooter implements ng.IDirective { meatier? Give our generator a try… it’s tasty!List
@@ -368,40 +368,40 @@ export class CardMenuFooter implements ng.IDirective {Checkboxes
-
IntelePeer Pro
-
Radio Buttons
@@ -410,19 +410,19 @@ export class CardMenuFooter implements ng.IDirective {
WebEx
@@ -439,8 +439,8 @@ export class CardMenuFooter implements ng.IDirective {
View More
@@ -459,21 +459,21 @@ export class CardMenuFooter implements ng.IDirective {
Card header
@@ -486,8 +486,8 @@ export class CardMenuFooter implements ng.IDirective {
@@ -499,8 +499,8 @@ export class CardMenuFooter implements ng.IDirective {
List
@@ -511,8 +511,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
-
-
+
+
*/
diff --git a/angularjs/src/lib/components/cards/index.ts b/angularjs/src/lib/components/cards/index.ts
index ff70f08314..ed46b0f30f 100644
--- a/angularjs/src/lib/components/cards/index.ts
+++ b/angularjs/src/lib/components/cards/index.ts
@@ -10,12 +10,12 @@ import {
} from './card.component';
export default angular
- .module('collab.ui.cards', [])
- .directive('csCard', Card.factory)
- .controller('csCardCtrl', CardCtrl)
- .directive('csCardMenu', CardMenu.factory)
- .controller('csCardMenuCtrl', CardMenuCtrl)
- .directive('csCardMenuFooter', CardMenuFooter.factory)
- .controller('csCardMenuFooterCtrl', CardMenuFooterCtrl)
- .directive('csCardLayout', CardLayout.factory)
+ .module('momentum.ui.cards', [])
+ .directive('mdCard', Card.factory)
+ .controller('mdCardCtrl', CardCtrl)
+ .directive('mdCardMenu', CardMenu.factory)
+ .controller('mdCardMenuCtrl', CardMenuCtrl)
+ .directive('mdCardMenuFooter', CardMenuFooter.factory)
+ .controller('mdCardMenuFooterCtrl', CardMenuFooterCtrl)
+ .directive('mdCardLayout', CardLayout.factory)
.name;
diff --git a/angularjs/src/lib/components/checkbox/checkbox.component.ts b/angularjs/src/lib/components/checkbox/checkbox.component.ts
index 66b83c9a5b..381c6c37e2 100644
--- a/angularjs/src/lib/components/checkbox/checkbox.component.ts
+++ b/angularjs/src/lib/components/checkbox/checkbox.component.ts
@@ -46,7 +46,7 @@ export class CheckboxComponent implements ng.IComponentOptions {
public controller = CheckboxCtrl;
public template = `
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -607,8 +607,8 @@ export class CardMenuFooter implements ng.IDirective {
VIEW MORE
-
-
+
+
*/
@@ -639,8 +639,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section card-sizes
*
* @html
-
-
+
+
@@ -648,8 +648,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -657,8 +657,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -666,8 +666,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -675,8 +675,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
*/
/**
@@ -684,7 +684,7 @@ export class CardMenuFooter implements ng.IDirective {
* @section header
*
* @html
-
+
@@ -694,7 +694,7 @@ export class CardMenuFooter implements ng.IDirective {
-
+
*/
/**
@@ -702,7 +702,7 @@ export class CardMenuFooter implements ng.IDirective {
* @section header-borders
*
* @html
-
+
@@ -712,7 +712,7 @@ export class CardMenuFooter implements ng.IDirective {
-
+
*/
/**
@@ -720,7 +720,7 @@ export class CardMenuFooter implements ng.IDirective {
* @section header-background
*
* @html
-
+
@@ -730,7 +730,7 @@ export class CardMenuFooter implements ng.IDirective {
-
+
*/
/**
@@ -738,8 +738,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section header-background-colors
*
* @html
-
-
+
+
-
+
+
List
@@ -536,40 +536,40 @@ export class CardMenuFooter implements ng.IDirective {Checkboxes
-
IntelePeer Pro
-
Radio Buttons
@@ -578,19 +578,19 @@ export class CardMenuFooter implements ng.IDirective { WebEx
@@ -607,8 +607,8 @@ export class CardMenuFooter implements ng.IDirective {
VIEW MORE
Small Card - 4 across
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.
Medium Card 3 across
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.
Large Card 2 across
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.
Full Card 1 across
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.
Header
Header Border
Header
@@ -757,8 +757,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
-
-
+
+
*/
/**
@@ -1080,8 +1080,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section cards-with-images
*
* @html
-
-
+
+
@@ -1093,8 +1093,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -1106,8 +1106,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
*/
/**
@@ -1116,7 +1116,7 @@ export class CardMenuFooter implements ng.IDirective {
*
* @html
+
Trial
-
-
+
+
-
+
-
+
*
* @js
@@ -1168,8 +1168,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section configure-services-card
*
* @html
-
@@ -776,8 +776,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -787,8 +787,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -798,8 +798,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -809,8 +809,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -820,8 +820,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -831,8 +831,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -842,8 +842,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -853,8 +853,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
*/
/**
@@ -862,7 +862,7 @@ export class CardMenuFooter implements ng.IDirective {
* @section header-bar
*
* @html
-
+
@@ -872,7 +872,7 @@ export class CardMenuFooter implements ng.IDirective {
-
+
*/
/**
@@ -880,8 +880,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section header-alignment
*
* @html
-
-
+
+
@@ -891,8 +891,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -902,8 +902,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
*/
/**
@@ -911,7 +911,7 @@ export class CardMenuFooter implements ng.IDirective {
* @section without-a-header
*
* @html
-
+
-
+
*/
/**
@@ -930,8 +930,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section section-background
*
* @html
-
-
+
+
@@ -941,8 +941,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
@@ -952,8 +952,8 @@ export class CardMenuFooter implements ng.IDirective {
-
-
+
+
*/
/**
@@ -961,8 +961,8 @@ export class CardMenuFooter implements ng.IDirective {
* @section section-content
*
* @html
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -1046,8 +1046,8 @@ export class CardMenuFooter implements ng.IDirective {
View More
-
-
+
+
@@ -1071,8 +1071,8 @@ export class CardMenuFooter implements ng.IDirective {
Header
Header
Header
Header
Header
Header
Header
Header
To the Left
Centered
@@ -922,7 +922,7 @@ export class CardMenuFooter implements ng.IDirective { VIEW MORE
Section White
Section Gray
List
@@ -975,40 +975,40 @@ export class CardMenuFooter implements ng.IDirective {Checkboxes
-
IntelePeer Pro
-
Radio Buttons
@@ -1017,19 +1017,19 @@ export class CardMenuFooter implements ng.IDirective { WebEx
@@ -1046,8 +1046,8 @@ export class CardMenuFooter implements ng.IDirective {
View More
WebEx
@@ -1071,8 +1071,8 @@ export class CardMenuFooter implements ng.IDirective {
Card header
@@ -1106,8 +1106,8 @@ export class CardMenuFooter implements ng.IDirective {
-
+
- Call
@@ -1128,11 +1128,11 @@ export class CardMenuFooter implements ng.IDirective {
Last Month: 302
pg_marketing.webex.com
@@ -1206,8 +1206,8 @@ export class CardMenuFooter implements ng.IDirective {
-
+
@@ -57,7 +57,7 @@ export class CheckboxComponent implements ng.IComponentOptions {
label: '@',
id: '@ckid',
isDisabled: '
+
- {{csTabset.heading}}
+ {{mdTabset.heading}}
`,
transclude: true,
@@ -104,10 +104,10 @@ export function csTab($parse) {
//Empty controller so other directives can require being 'under' a tab
},
compile: function (elm, attrs, transclude) {
- return function postLink(scope, elm, attrs, csTabset) {
+ return function postLink(scope, elm, attrs, mdTabset) {
scope.$watch('active', function (active) {
if (active) {
- csTabset.select(scope);
+ mdTabset.select(scope);
}
});
@@ -124,9 +124,9 @@ export function csTab($parse) {
}
};
- csTabset.addTab(scope);
+ mdTabset.addTab(scope);
scope.$on('$destroy', function () {
- csTabset.removeTab(scope);
+ mdTabset.removeTab(scope);
});
//We need to transclude later, once the content container is ready.
@@ -136,13 +136,13 @@ export function csTab($parse) {
},
};
- return csTabDirective;
+ return mdTabDirective;
}
-export function csTabHeadingTransclude() {
- let csTabHeadingTranscludeDirective = {
+export function mdTabHeadingTransclude() {
+ let mdTabHeadingTranscludeDirective = {
restrict: 'A',
- require: '^csTab',
+ require: '^mdTab',
link: link,
};
@@ -155,18 +155,18 @@ export function csTabHeadingTransclude() {
});
}
- return csTabHeadingTranscludeDirective;
+ return mdTabHeadingTranscludeDirective;
}
-export function csTabContentTransclude() {
- let csTabContentTranscludeDirective = {
+export function mdTabContentTransclude() {
+ let mdTabContentTranscludeDirective = {
restrict: 'A',
- require: '^csTabset',
+ require: '^mdTabset',
link: link,
};
function link(scope, elm, attrs) {
- let tab = scope.$eval(attrs.csTabContentTransclude);
+ let tab = scope.$eval(attrs.mdTabContentTransclude);
//Now our tab is ready to be transcluded: both the tab heading area
//and the tab content area are loaded. Transclude 'em both.
@@ -184,12 +184,12 @@ export function csTabContentTransclude() {
function isTabHeading(node) {
return node.tagName && (
- node.hasAttribute('cs-tab-heading') ||
- node.hasAttribute('data-cs-tab-heading') ||
- node.tagName.toLowerCase() === 'cs-tab-heading' ||
- node.tagName.toLowerCase() === 'data-cs-tab-heading'
+ node.hasAttribute('md-tab-heading') ||
+ node.hasAttribute('data-md-tab-heading') ||
+ node.tagName.toLowerCase() === 'md-tab-heading' ||
+ node.tagName.toLowerCase() === 'data-md-tab-heading'
);
}
- return csTabContentTranscludeDirective;
+ return mdTabContentTranscludeDirective;
}
diff --git a/angularjs/src/lib/components/leftnav/index.ts b/angularjs/src/lib/components/leftnav/index.ts
index 3609cfae72..deaa750c2f 100644
--- a/angularjs/src/lib/components/leftnav/index.ts
+++ b/angularjs/src/lib/components/leftnav/index.ts
@@ -1,11 +1,11 @@
import * as angular from 'angular';
import {
- csLeftNav,
- csSubNav,
+ mdLeftNav,
+ mdSubNav,
} from './leftnav.component';
export default angular
- .module('collab.ui.leftnav', [])
- .directive('csLeftNav', csLeftNav)
- .directive('csSubNav', csSubNav)
+ .module('momentum.ui.leftnav', [])
+ .directive('mdLeftNav', mdLeftNav)
+ .directive('mdSubNav', mdSubNav)
.name;
diff --git a/angularjs/src/lib/components/leftnav/leftnav.component.ts b/angularjs/src/lib/components/leftnav/leftnav.component.ts
index c4def91fda..b7e0a681d2 100644
--- a/angularjs/src/lib/components/leftnav/leftnav.component.ts
+++ b/angularjs/src/lib/components/leftnav/leftnav.component.ts
@@ -1,6 +1,6 @@
-csLeftNav.$inject = ['$location'];
-export function csLeftNav($location) {
- let csLeftNavDirective = {
+mdLeftNav.$inject = ['$location'];
+export function mdLeftNav($location) {
+ let mdLeftNavDirective = {
restrict: 'EA',
scope: {
pages: '=',
@@ -9,16 +9,16 @@ export function csLeftNav($location) {
*/
diff --git a/angularjs/src/lib/components/radiolist/index.ts b/angularjs/src/lib/components/radiolist/index.ts
index 3a71385496..df6115ed19 100644
--- a/angularjs/src/lib/components/radiolist/index.ts
+++ b/angularjs/src/lib/components/radiolist/index.ts
@@ -1,7 +1,7 @@
import * as angular from 'angular';
-import { csRadiolist } from './radiolist.component';
+import { mdRadiolist } from './radiolist.component';
export default angular
- .module('collab.ui.radiolist', [])
- .directive('csRadiolist', csRadiolist)
+ .module('momentum.ui.radiolist', [])
+ .directive('mdRadiolist', mdRadiolist)
.name;
diff --git a/angularjs/src/lib/components/radiolist/radiolist.component.ts b/angularjs/src/lib/components/radiolist/radiolist.component.ts
index 2f80da7e5b..5c7f9b49b5 100644
--- a/angularjs/src/lib/components/radiolist/radiolist.component.ts
+++ b/angularjs/src/lib/components/radiolist/radiolist.component.ts
@@ -1,4 +1,4 @@
-export function csRadiolist() {
+export function mdRadiolist() {
let directive = {
scope: {
options: '=',
diff --git a/angularjs/src/lib/components/searchfilter/index.ts b/angularjs/src/lib/components/searchfilter/index.ts
index 3cfef08dfb..433d30370b 100644
--- a/angularjs/src/lib/components/searchfilter/index.ts
+++ b/angularjs/src/lib/components/searchfilter/index.ts
@@ -2,6 +2,6 @@ import * as angular from 'angular';
import { SearchFilter } from './searchfilter.component';
export default angular
- .module('collab.ui.searchfilter', [])
- .component('csSearchfilter', new SearchFilter())
+ .module('momentum.ui.searchfilter', [])
+ .component('mdSearchfilter', new SearchFilter())
.name;
diff --git a/angularjs/src/lib/components/searchfilter/searchfilter.component.ts b/angularjs/src/lib/components/searchfilter/searchfilter.component.ts
index f7ad6c3b8b..132dc2e9ce 100644
--- a/angularjs/src/lib/components/searchfilter/searchfilter.component.ts
+++ b/angularjs/src/lib/components/searchfilter/searchfilter.component.ts
@@ -122,20 +122,20 @@ export class SearchFilter implements ng.IComponentOptions {
-
-
@@ -78,18 +78,18 @@ export function csTabset() {
scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
}
- return csTabsetDirective;
+ return mdTabsetDirective;
}
-csTab.$inject = ['$parse'];
-export function csTab($parse) {
- let csTabDirective = {
- require: '^csTabset',
+mdTab.$inject = ['$parse'];
+export function mdTab($parse) {
+ let mdTabDirective = {
+ require: '^mdTabset',
restrict: 'EA',
replace: true,
template: `
+
-
+
-
+
+
-
-
+
-
@@ -194,7 +194,7 @@ export class SearchFilter implements ng.IComponentOptions {
diff --git a/angularjs/src/lib/components/select/index.ts b/angularjs/src/lib/components/select/index.ts index 6e23191108..e95a872ec8 100644 --- a/angularjs/src/lib/components/select/index.ts +++ b/angularjs/src/lib/components/select/index.ts @@ -1,15 +1,15 @@ import * as angular from 'angular'; import { - csSelect, - csSelectCtrl, - csSelectSearchable, + mdSelect, + mdSelectCtrl, + mdSelectSearchable, CSSelectService, } from './select.component'; export default angular - .module('collab.ui.select', []) - .directive('csSelect', csSelect) + .module('momentum.ui.select', []) + .directive('mdSelect', mdSelect) .service('CSSelectService', CSSelectService) - .controller('csSelectCtrl', csSelectCtrl) - .filter('cssearchable', csSelectSearchable) + .controller('mdSelectCtrl', mdSelectCtrl) + .filter('foobarearchable', mdSelectSearchable) .name; diff --git a/angularjs/src/lib/components/select/select.component.html b/angularjs/src/lib/components/select/select.component.html index 2330d6192d..08ade33265 100644 --- a/angularjs/src/lib/components/select/select.component.html +++ b/angularjs/src/lib/components/select/select.component.html @@ -1,88 +1,88 @@ -PageTitle -
+ -++-+- {{ csSelect.getLabel(csSelect.selected) }}{{ csSelect.selected.selectedChild && ' : ' }}{{ csSelect.getLabel(csSelect.selected.selectedChild) }} - {{::csSelect.placeholder}} - + {{ mdSelect.getLabel(mdSelect.selected) }}{{ mdSelect.selected.selectedChild && ' : ' }}{{ mdSelect.getLabel(mdSelect.selected.selectedChild) }} + {{::mdSelect.placeholder}} +-- {{ csSelect.getMsg() }} +- -+ {{ mdSelect.getMsg() }}- ++- {{ csSelect.placeholder }} - + {{ mdSelect.placeholder }} +-- {{ csSelect.getMsg() }} +- -+ {{ mdSelect.getMsg() }}- ++- {{ csSelect.getLabel(csSelect.selected) }} - {{::csSelect.placeholder}} - + {{ mdSelect.getLabel(mdSelect.selected) }} + {{::mdSelect.placeholder}} + -+diff --git a/angularjs/src/lib/components/select/select.component.ts b/angularjs/src/lib/components/select/select.component.ts index 45277b9b68..0c7e5ae768 100644 --- a/angularjs/src/lib/components/select/select.component.ts +++ b/angularjs/src/lib/components/select/select.component.ts @@ -6,7 +6,7 @@ import * as _ from 'lodash'; import { KeyCodes } from '../../directives/dropdown/keyCodes'; /* @ngInject */ -export function csSelectSearchable($filter) { +export function mdSelectSearchable($filter) { return function (values, option, comparator) { if (option && comparator && comparator.length !== 0) { return $filter('filter')(values, comparator); @@ -24,7 +24,7 @@ export class CSSelectService { } /* @ngInject */ -export function csSelectCtrl($element, $filter, $timeout) { +export function mdSelectCtrl($element, $filter, $timeout) { /*jshint validthis: true */ let vm = this; vm.filterOptions = ''; @@ -134,8 +134,8 @@ export function csSelectCtrl($element, $filter, $timeout) { styles.push('select-selected'); } } - if (option.css) { - styles.push(option.css); + if (option.foobar) { + styles.push(option.foobar); } } if (option.childOptions) { @@ -172,7 +172,7 @@ export function csSelectCtrl($element, $filter, $timeout) { vm.cloneOptions = _.cloneDeep(vm.options); } vm.manualChange = true; - vm.options = $filter('cssearchable')(vm.cloneOptions, vm.searchableCombo, value); + vm.options = $filter('mdsearchable')(vm.cloneOptions, vm.searchableCombo, value); } if (_.isFunction(vm.onChangeFn)) { @@ -246,7 +246,7 @@ export function csSelectCtrl($element, $filter, $timeout) { /* @ngInject */ -export function csSelect($document, $timeout, $window, CSSelectService: CSSelectService) { +export function mdSelect($document, $timeout, $window, CSSelectService: CSSelectService) { let directive = { restrict: 'EA', template: selectTemplate, @@ -261,7 +261,7 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect selected: '=ngModel', placeholder: '=', inputPlaceholder: '=', - required: '=csRequired', + required: '=mdRequired', isDisabled: '=', hasError: '=', filter: '@', @@ -284,15 +284,15 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect iconnested: '@', }, link: function (scope, element, attrs, ngModel) { - scope.csSelect.selectId = CSSelectService.getId(); + scope.mdSelect.selectId = CSSelectService.getId(); element.mouseenter(function () { if (element.find('.ellipsis')[0] !== undefined && element.find('.text-wrap')[0] !== undefined && (element.find('.ellipsis')[0].getBoundingClientRect().bottom >= element.find('.text-wrap')[0].getBoundingClientRect().bottom)) { scope.$apply(function () { - scope.csSelect.isWrap = false; + scope.mdSelect.isWrap = false; }); } else { scope.$apply(function () { - scope.csSelect.isWrap = true; + scope.mdSelect.isWrap = true; }); } }); @@ -302,13 +302,13 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect element.find('#selectMain').focus(); } else if (event.which === KeyCodes.LEFT) { scope.$apply(function () { - scope.csSelect.toggleNestedMenu(); + scope.mdSelect.toggleNestedMenu(); }); } else if (event.which === KeyCodes.RIGHT) { const index = _.toNumber(event.currentTarget.activeElement.getAttribute('option-number')); - if (_.isFinite(index) && !_.get(scope.csSelect.options[index], 'menu', false)) { + if (_.isFinite(index) && !_.get(scope.mdSelect.options[index], 'menu', false)) { scope.$apply(function () { - scope.csSelect.toggleNestedMenu(scope.csSelect.options[index]); + scope.mdSelect.toggleNestedMenu(scope.mdSelect.options[index]); }); } } @@ -329,12 +329,12 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect isSelf = element[0] === event.target, isInside = isChild || isSelf; if (!isInside) { scope.$apply(function () { - scope.csSelect.showFullMsg = false; + scope.mdSelect.showFullMsg = false; }); } }; - scope.$watch('csSelect.showFullMsg && csSelect.isWrap', function (newValue, oldValue) { + scope.$watch('mdSelect.showFullMsg && mdSelect.isWrap', function (newValue, oldValue) { if (newValue !== oldValue && newValue === true) { $document.bind('click', fullMsgOnClick); } else if (newValue !== oldValue && newValue === false) { @@ -342,16 +342,16 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect } }); - if (scope.csSelect.multi) { - scope.csSelect.defaultPlaceholder = scope.csSelect.placeholder; + if (scope.mdSelect.multi) { + scope.mdSelect.defaultPlaceholder = scope.mdSelect.placeholder; let setPlaceholder = function () { - if (scope.csSelect.selected.length === 0) { - scope.csSelect.placeholder = scope.csSelect.defaultPlaceholder; - } else if (scope.csSelect.selected.length === 1) { - scope.csSelect.placeholder = scope.csSelect.selected.length + ' ' + scope.csSelect.singular + ' Selected'; + if (scope.mdSelect.selected.length === 0) { + scope.mdSelect.placeholder = scope.mdSelect.defaultPlaceholder; + } else if (scope.mdSelect.selected.length === 1) { + scope.mdSelect.placeholder = scope.mdSelect.selected.length + ' ' + scope.mdSelect.singular + ' Selected'; } else { - scope.csSelect.placeholder = scope.csSelect.selected.length + ' ' + scope.csSelect.plural + ' Selected'; + scope.mdSelect.placeholder = scope.mdSelect.selected.length + ' ' + scope.mdSelect.plural + ' Selected'; } }; setPlaceholder(); @@ -363,103 +363,103 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect isInside = isChild || isSelf || isSpan; if (!isInside) { scope.$apply(function () { - scope.csSelect.menuOpen = false; + scope.mdSelect.menuOpen = false; $(element).find('.dropdown-menu').scrollTop(0); }); } }; - scope.$watch('csSelect.menuOpen', function (newValue, oldValue) { + scope.$watch('mdSelect.menuOpen', function (newValue, oldValue) { element.find('.dropdown-menu').addClass('visible'); if (newValue !== oldValue && newValue === true) { $document.bind('click', onClick); - scope.csSelect.onCloseFn(); + scope.mdSelect.onCloseFn(); } else if (newValue !== oldValue && newValue === false) { $document.unbind('click', onClick); } }); - scope.$watch('csSelect.options', function (newValue, oldValue) { + scope.$watch('mdSelect.options', function (newValue, oldValue) { if (_.isArray(newValue) && _.isArray(oldValue) && (newValue.length !== oldValue.length)) { setPlaceholder(); } }); - scope.$watch('csSelect.selected', function (newValue, oldValue) { + scope.$watch('mdSelect.selected', function (newValue, oldValue) { if (_.isArray(newValue) && _.isArray(oldValue) && (newValue.length !== oldValue.length)) { setPlaceholder(); } }); - scope.csSelect.selectOption = function (option) { - if (_.isUndefined(scope.csSelect.selected) || !_.includes(_.map(scope.csSelect.selected, scope.csSelect.valuefield), option[scope.csSelect.valuefield])) { - if (!_.isUndefined(scope.csSelect.max)) { - if (scope.csSelect.selected.length === scope.csSelect.max) { + scope.mdSelect.selectOption = function (option) { + if (_.isUndefined(scope.mdSelect.selected) || !_.includes(_.map(scope.mdSelect.selected, scope.mdSelect.valuefield), option[scope.mdSelect.valuefield])) { + if (!_.isUndefined(scope.mdSelect.max)) { + if (scope.mdSelect.selected.length === scope.mdSelect.max) { return; - } else if (scope.csSelect.selected.length === (scope.csSelect.max - 1)) { - scope.csSelect.isDisable = true; + } else if (scope.mdSelect.selected.length === (scope.mdSelect.max - 1)) { + scope.mdSelect.isDisable = true; } else { - scope.csSelect.isDisable = false; + scope.mdSelect.isDisable = false; } } - scope.csSelect.selected.push(option); + scope.mdSelect.selected.push(option); option.isSelected = true; - ngModel.$setViewValue(scope.csSelect.selected); + ngModel.$setViewValue(scope.mdSelect.selected); setPlaceholder(); - scope.csSelect.changefunction(option); + scope.mdSelect.changefunction(option); } else { - _.forEach(scope.csSelect.selected, function (value, key) { - if (!_.isUndefined(value) && value[scope.csSelect.valuefield] === option[scope.csSelect.valuefield]) { - scope.csSelect.selected.splice(key, 1); - ngModel.$setViewValue(scope.csSelect.selected); + _.forEach(scope.mdSelect.selected, function (value, key) { + if (!_.isUndefined(value) && value[scope.mdSelect.valuefield] === option[scope.mdSelect.valuefield]) { + scope.mdSelect.selected.splice(key, 1); + ngModel.$setViewValue(scope.mdSelect.selected); setPlaceholder(); option.isSelected = false; - scope.csSelect.isDisable = false; - scope.csSelect.changefunction(option); + scope.mdSelect.isDisable = false; + scope.mdSelect.changefunction(option); } }); } }; } else { - scope.csSelect.selectOption = function (option, parentOption) { - if (_.isUndefined(scope.csSelect.selected) || option !== scope.csSelect.selected) { + scope.mdSelect.selectOption = function (option, parentOption) { + if (_.isUndefined(scope.mdSelect.selected) || option !== scope.mdSelect.selected) { // return parent with injected child if found if (parentOption) { parentOption.selectedChild = option; option = parentOption; } - scope.csSelect.clickedComboSelection = true; + scope.mdSelect.clickedComboSelection = true; ngModel.$setViewValue(option); - scope.csSelect.changefunction(option); + scope.mdSelect.changefunction(option); } }; - if (scope.csSelect.combo && !scope.csSelect.isDisabled) { + if (scope.mdSelect.combo && !scope.mdSelect.isDisabled) { element.on('click', function () { $timeout(function () { - if (!scope.csSelect.clickedComboSelection) { - scope.csSelect.menuOpen = true; + if (!scope.mdSelect.clickedComboSelection) { + scope.mdSelect.menuOpen = true; } - scope.csSelect.clickedComboSelection = false; + scope.mdSelect.clickedComboSelection = false; }, 0); }); - scope.$watch('csSelect.menuOpen', function (newValue, oldValue) { - if (newValue !== oldValue && newValue === true && scope.csSelect.cloneOptions) { - scope.csSelect.options = _.cloneDeep(scope.csSelect.cloneOptions); + scope.$watch('mdSelect.menuOpen', function (newValue, oldValue) { + if (newValue !== oldValue && newValue === true && scope.mdSelect.cloneOptions) { + scope.mdSelect.options = _.cloneDeep(scope.mdSelect.cloneOptions); } }); - scope.$watch('csSelect.options', function (newValue, oldValue) { - if (_.isArray(newValue) && _.isArray(oldValue) && (newValue !== oldValue) && !scope.csSelect.manualChange) { - scope.csSelect.cloneOptions = _.cloneDeep(newValue); + scope.$watch('mdSelect.options', function (newValue, oldValue) { + if (_.isArray(newValue) && _.isArray(oldValue) && (newValue !== oldValue) && !scope.mdSelect.manualChange) { + scope.mdSelect.cloneOptions = _.cloneDeep(newValue); } else { - scope.csSelect.manualChange = false; + scope.mdSelect.manualChange = false; } }); } } }, - controller: csSelectCtrl, - controllerAs: 'csSelect', + controller: mdSelectCtrl, + controllerAs: 'mdSelect', bindToController: true, replace: true, }; @@ -467,91 +467,91 @@ export function csSelect($document, $timeout, $window, CSSelectService: CSSelect } const selectTemplate = ` ---- {{ csSelect.getMsg() }} +-+ {{ mdSelect.getMsg() }}- +{{ csSelect.secondaryLabel }}+{{ mdSelect.secondaryLabel }}-++-+- {{ csSelect.getLabel(csSelect.selected) }}{{ csSelect.selected.selectedChild && ' : ' }}{{ csSelect.getLabel(csSelect.selected.selectedChild) }} - {{::csSelect.placeholder}} - + {{ mdSelect.getLabel(mdSelect.selected) }}{{ mdSelect.selected.selectedChild && ' : ' }}{{ mdSelect.getLabel(mdSelect.selected.selectedChild) }} + {{::mdSelect.placeholder}} +-- {{ csSelect.getMsg() }} +- -+ {{ mdSelect.getMsg() }}- ++- {{ csSelect.placeholder }} - + {{ mdSelect.placeholder }} +`, transclude: true, - link: function (scope, element, attrs, CsSidePanelCtrl) { - scope.close = CsSidePanelCtrl.close; + link: function (scope, element, attrs, MdSidePanelCtrl) { + scope.close = MdSidePanelCtrl.close; }, }; return directive; } -export function csSpContainer() { - // Usage:-- {{ csSelect.getMsg() }} +- -+ {{ mdSelect.getMsg() }}- ++- {{ csSelect.getLabel(csSelect.selected) }} - {{::csSelect.placeholder}} - + {{ mdSelect.getLabel(mdSelect.selected) }} + {{::mdSelect.placeholder}} + -@@ -1082,7 +1082,7 @@ const selectTemplate = `+`; /* @@ -707,12 +707,12 @@ const selectTemplate = ` @@ -786,7 +786,7 @@ const selectTemplate = ` @@ -902,7 +902,7 @@ const selectTemplate = ` @@ -996,7 +996,7 @@ const selectTemplate = `--- {{ csSelect.getMsg() }} +-+ {{ mdSelect.getMsg() }}- +{{ csSelect.secondaryLabel }}+{{ mdSelect.secondaryLabel }}Selected label is {{sel.selected.label}} Selected value is {{sel.selected.value}}
-- +@@ -1310,13 +1310,13 @@ const selectTemplate = ` @@ -1390,14 +1390,14 @@ const selectTemplate = ` @@ -1481,7 +1481,7 @@ const selectTemplate = ` @@ -1573,7 +1573,7 @@ const selectTemplate = ` @@ -1704,17 +1704,17 @@ const selectTemplate = `-- +-
-
-
-
+
- + {{::adminpage.title}} diff --git a/angularjs/src/lib/components/sidepanel/index.ts b/angularjs/src/lib/components/sidepanel/index.ts index 73a21b3915..bcd06cd761 100644 --- a/angularjs/src/lib/components/sidepanel/index.ts +++ b/angularjs/src/lib/components/sidepanel/index.ts @@ -1,19 +1,19 @@ import * as angular from 'angular'; import { - CsSidePanelCtrl, - csSidepanel, - csSpHeader, - csSpContainer, - csSpSection, - csSpButtons, + MdSidePanelCtrl, + mdSidepanel, + mdSpHeader, + mdSpContainer, + mdSpSection, + mdSpButtons, } from './sidepanel.component'; export default angular - .module('collab.ui.sidepanel', []) - .controller('CsSidePanelCtrl', CsSidePanelCtrl) - .directive('csSidepanel', csSidepanel) - .directive('csSpHeader', csSpHeader) - .directive('csSpContainer', csSpContainer) - .directive('csSpSection', csSpSection) - .directive('csSpButtons', csSpButtons) + .module('momentum.ui.sidepanel', []) + .controller('MdSidePanelCtrl', MdSidePanelCtrl) + .directive('mdSidepanel', mdSidepanel) + .directive('mdSpHeader', mdSpHeader) + .directive('mdSpContainer', mdSpContainer) + .directive('mdSpSection', mdSpSection) + .directive('mdSpButtons', mdSpButtons) .name; diff --git a/angularjs/src/lib/components/sidepanel/sidepanel.component.ts b/angularjs/src/lib/components/sidepanel/sidepanel.component.ts index 31c589ccf6..1e5dbbd94c 100644 --- a/angularjs/src/lib/components/sidepanel/sidepanel.component.ts +++ b/angularjs/src/lib/components/sidepanel/sidepanel.component.ts @@ -5,7 +5,7 @@ // const sidepanelModalTemplate = require('./sidepanel-modal.html'); /* @ngInject */ -export function CsSidePanelCtrl($state) { +export function MdSidePanelCtrl($state) { /*jshint validthis: true */ let vm = this; vm.close = closePanel; @@ -15,11 +15,11 @@ export function CsSidePanelCtrl($state) { } } -export function csSidepanel() { - // Usage:
+export function mdSidepanel() { + // Usage: let directive = { restrict: 'E', - controller: 'CsSidePanelCtrl', + controller: 'MdSidePanelCtrl', controllerAs: 'sp', scope: { size: '@', @@ -30,10 +30,10 @@ export function csSidepanel() { return directive; } -export function csSpHeader() { - // Usage: +export function mdSpHeader() { + // Usage: let directive = { - require: '^csSidepanel', + require: '^mdSidepanel', restrict: 'E', template: ` @@ -44,22 +44,22 @@ export function csSpHeader() { - + {{::adminpage.title}} diff --git a/angularjs/src/lib/components/sidepanel/index.ts b/angularjs/src/lib/components/sidepanel/index.ts index 73a21b3915..bcd06cd761 100644 --- a/angularjs/src/lib/components/sidepanel/index.ts +++ b/angularjs/src/lib/components/sidepanel/index.ts @@ -1,19 +1,19 @@ import * as angular from 'angular'; import { - CsSidePanelCtrl, - csSidepanel, - csSpHeader, - csSpContainer, - csSpSection, - csSpButtons, + MdSidePanelCtrl, + mdSidepanel, + mdSpHeader, + mdSpContainer, + mdSpSection, + mdSpButtons, } from './sidepanel.component'; export default angular - .module('collab.ui.sidepanel', []) - .controller('CsSidePanelCtrl', CsSidePanelCtrl) - .directive('csSidepanel', csSidepanel) - .directive('csSpHeader', csSpHeader) - .directive('csSpContainer', csSpContainer) - .directive('csSpSection', csSpSection) - .directive('csSpButtons', csSpButtons) + .module('momentum.ui.sidepanel', []) + .controller('MdSidePanelCtrl', MdSidePanelCtrl) + .directive('mdSidepanel', mdSidepanel) + .directive('mdSpHeader', mdSpHeader) + .directive('mdSpContainer', mdSpContainer) + .directive('mdSpSection', mdSpSection) + .directive('mdSpButtons', mdSpButtons) .name; diff --git a/angularjs/src/lib/components/sidepanel/sidepanel.component.ts b/angularjs/src/lib/components/sidepanel/sidepanel.component.ts index 31c589ccf6..1e5dbbd94c 100644 --- a/angularjs/src/lib/components/sidepanel/sidepanel.component.ts +++ b/angularjs/src/lib/components/sidepanel/sidepanel.component.ts @@ -5,7 +5,7 @@ // const sidepanelModalTemplate = require('./sidepanel-modal.html'); /* @ngInject */ -export function CsSidePanelCtrl($state) { +export function MdSidePanelCtrl($state) { /*jshint validthis: true */ let vm = this; vm.close = closePanel; @@ -15,11 +15,11 @@ export function CsSidePanelCtrl($state) { } } -export function csSidepanel() { - // Usage:
+export function mdSpContainer() { + // Usage: let directive = { restrict: 'E', template: ` * * @js @@ -658,7 +658,7 @@ export function csSlider(Slider) { * @html@@ -69,16 +69,16 @@ export function csSpContainer() { `, transclude: true, scope: { - csTabindex: ' + mdTabindex: ' }, }; return directive; } -export function csSpSection() { - // Usage:+export function mdSpSection() { + // Usage: let directive = { restrict: 'E', template: ``, @@ -87,8 +87,8 @@ export function csSpSection() { return directive; } -export function csSpButtons() { - // Usage: +export function mdSpButtons() { + // Usage: let directive = { restrict: 'E', scope: { diff --git a/angularjs/src/lib/components/slider/index.ts b/angularjs/src/lib/components/slider/index.ts index cf1a64e910..4586641e9f 100644 --- a/angularjs/src/lib/components/slider/index.ts +++ b/angularjs/src/lib/components/slider/index.ts @@ -1,13 +1,13 @@ import * as angular from 'angular'; import { - csSlider, + mdSlider, throttle, SliderFactory, } from './slider.component'; export default angular - .module('collab.ui.slider', []) + .module('momentum.ui.slider', []) .value('throttle', throttle) .factory('SliderFactory', SliderFactory) - .directive('csSlider', csSlider) + .directive('mdSlider', mdSlider) .name; diff --git a/angularjs/src/lib/components/slider/slider.component.ts b/angularjs/src/lib/components/slider/slider.component.ts index f105608c9b..b8c9d392eb 100644 --- a/angularjs/src/lib/components/slider/slider.component.ts +++ b/angularjs/src/lib/components/slider/slider.component.ts @@ -68,7 +68,7 @@ export function SliderFactory($timeout, $document, $window, throttle) { //* Custom hashmark translate function @type {function} */ this.customHashTrFn = this.scope.hashMarkTranslate() || function (value) { return String(value); }; //* Array of de-registration functions to call on $destroy @type {Array. } */ - this.deRegFuncs = []; + this.deRegFunmd = []; // Slider DOM elements wrapped in jqLite this.fullBar = null; // The whole slider bar @@ -107,7 +107,7 @@ export function SliderFactory($timeout, $document, $window, throttle) { // Recalculate slider view dimensions unRegFn = this.scope.$on('reCalcViewDimensions', calcDimFn.bind(this)); - this.deRegFuncs.push(unRegFn); + this.deRegFunmd.push(unRegFn); // Recalculate stuff if view port dimensions have changed angular.element($window).on('resize', calcDimFn.bind(this)); @@ -128,7 +128,7 @@ export function SliderFactory($timeout, $document, $window, throttle) { self.updateSelectionBar(); }, 350, { leading: false }); - this.scope.$on('csSliderForceRender', function () { + this.scope.$on('mdSliderForceRender', function () { thrLow(); if (self.range) { thrHigh(); } self.resetSlider(); @@ -139,31 +139,31 @@ export function SliderFactory($timeout, $document, $window, throttle) { if (newValue === oldValue) { return; } thrLow(); }); - this.deRegFuncs.push(unRegFn); + this.deRegFunmd.push(unRegFn); unRegFn = this.scope.$watch('sliderHigh', function (newValue, oldValue) { if (newValue === oldValue) { return; } thrHigh(); }); - this.deRegFuncs.push(unRegFn); + this.deRegFunmd.push(unRegFn); this.scope.$watch('sliderFloor', function (newValue, oldValue) { if (newValue === oldValue) { return; } self.resetSlider(); }); - this.deRegFuncs.push(unRegFn); + this.deRegFunmd.push(unRegFn); unRegFn = this.scope.$watch('sliderCeil', function (newValue, oldValue) { if (newValue === oldValue) { return; } self.resetSlider(); }); - this.deRegFuncs.push(unRegFn); + this.deRegFunmd.push(unRegFn); this.scope.$on('$destroy', function () { self.minH.off(); self.maxH.off(); angular.element($window).off('resize', calcDimFn); - self.deRegFuncs.map(function (unbind) { unbind(); }); + self.deRegFunmd.map(function (unbind) { unbind(); }); }); }, @@ -212,8 +212,8 @@ export function SliderFactory($timeout, $document, $window, throttle) { let valStr = String(useCustomTr ? this.customTrFn(value) : value); - if (label.cssv === undefined || label.cssv.length !== valStr.length || (label.cssv.length > 0 && label.cssw === 0)) { - label.cssv = valStr; + if (label.foobarv === undefined || label.foobarv.length !== valStr.length || (label.foobarv.length > 0 && label.foobarw === 0)) { + label.foobarv = valStr; } }, @@ -256,15 +256,15 @@ export function SliderFactory($timeout, $document, $window, throttle) { }, this); // Initialize offset cache properties - this.fullBar.cssl = 0; - this.selBar.cssl = 0; - this.minH.cssl = 0; - this.maxH.cssl = 0; + this.fullBar.foobarl = 0; + this.selBar.foobarl = 0; + this.minH.foobarl = 0; + this.maxH.foobarl = 0; // Remove stuff not needed in single slider if (this.range === false) { // Hide max handle - this.maxH.csAlwaysHide = true; + this.maxH.mdAlwaysHide = true; this.maxH[0].style.zIndex = '-1000'; this.hideEl(this.maxH); } @@ -286,7 +286,7 @@ export function SliderFactory($timeout, $document, $window, throttle) { this.maxLeft = this.barWidth; this.getWidth(this.sliderElem); - this.sliderElem.cssl = this.sliderElem[0].getBoundingClientRect().left; + this.sliderElem.foobarl = this.sliderElem[0].getBoundingClientRect().left; if (this.initHasRun) { this.initHandles(); @@ -327,7 +327,7 @@ export function SliderFactory($timeout, $document, $window, throttle) { //* Update low slider handle position and label */ updateLowHandle: function (newOffset) { - let delta = Math.abs(this.minH.cssl - newOffset); + let delta = Math.abs(this.minH.foobarl - newOffset); if (delta <= 0 && delta < 1) { return; } this.setLeft(this.minH, newOffset); }, @@ -339,11 +339,11 @@ export function SliderFactory($timeout, $document, $window, throttle) { //*Update slider selection bar, combined label and range label */ updateSelectionBar: function () { - this.setWidth(this.selBar, Math.abs(this.maxH.cssl - this.minH.cssl)); + this.setWidth(this.selBar, Math.abs(this.maxH.foobarl - this.minH.foobarl)); if (this.showHashMarks) { - this.setLeft(this.selBar, this.range ? this.minH.cssl : 0); + this.setLeft(this.selBar, this.range ? this.minH.foobarl : 0); } else { - this.setLeft(this.selBar, this.range ? this.minH.cssl + this.handleHalfWidth : 0); + this.setLeft(this.selBar, this.range ? this.minH.foobarl + this.handleHalfWidth : 0); } }, @@ -359,34 +359,34 @@ export function SliderFactory($timeout, $document, $window, throttle) { //* Hide element */ hideEl: function (element) { - return element.css({ opacity: 0 }); + return element.foobar({ opacity: 0 }); }, //* Show element */ showEl: function (element) { - if (!!element.csAlwaysHide) { return element; } + if (!!element.mdAlwaysHide) { return element; } - return element.css({ opacity: 1 }); + return element.foobar({ opacity: 1 }); }, //* Set element left offset */ setLeft: function (elem, left) { - elem.cssl = left; - elem.css({ left: left + 'px' }); + elem.foobarl = left; + elem.foobar({ left: left + 'px' }); return left; }, //* Get element width */ getWidth: function (elem) { let val = elem[0].getBoundingClientRect(); - elem.cssw = val.right - val.left; - return elem.cssw; + elem.foobarw = val.right - val.left; + return elem.foobarw; }, //* Set element width */ setWidth: function (elem, width) { - elem.cssw = width; - elem.css({ width: width + 'px' }); + elem.foobarw = width; + elem.foobar({ width: width + 'px' }); return width; }, @@ -455,11 +455,11 @@ export function SliderFactory($timeout, $document, $window, throttle) { : event.originalEvent.touches[0].clientX; } - sliderLO = this.sliderElem.cssl; + sliderLO = this.sliderElem.foobarl; newOffset = eventX - sliderLO - this.handleHalfWidth; if (newOffset <= 0) { - if (pointer.cssl !== 0) { + if (pointer.foobarl !== 0) { if (!(this.tracking === 'sliderHigh' && newOffset < this.scope.sliderModel)) { this.scope[this.tracking] = this.minValue; this.updateHandles(this.tracking, 0); @@ -471,7 +471,7 @@ export function SliderFactory($timeout, $document, $window, throttle) { } if (newOffset >= this.maxLeft) { - if (pointer.cssl !== this.maxLeft) { + if (pointer.foobarl !== this.maxLeft) { if (!(this.tracking === 'sliderModel' && newOffset > this.scope.sliderHigh)) { this.scope[this.tracking] = this.maxValue; this.updateHandles(this.tracking, this.maxLeft); @@ -542,8 +542,8 @@ export function SliderFactory($timeout, $document, $window, throttle) { return Slider; } -csSlider.$inject = ['SliderFactory']; -export function csSlider(Slider) { +mdSlider.$inject = ['SliderFactory']; +export function mdSlider(Slider) { return { restrict: 'E', scope: { @@ -615,7 +615,7 @@ export function csSlider(Slider) {
-+ * * @js diff --git a/angularjs/src/lib/components/spinner/index.ts b/angularjs/src/lib/components/spinner/index.ts index 6959b6f845..420d45af3b 100644 --- a/angularjs/src/lib/components/spinner/index.ts +++ b/angularjs/src/lib/components/spinner/index.ts @@ -2,6 +2,6 @@ import * as angular from 'angular'; import { SpinnerComponent } from './spinner.component'; export default angular - .module('collab.ui.spinner', []) - .component('csSpinner', new SpinnerComponent()) + .module('momentum.ui.spinner', []) + .component('mdSpinner', new SpinnerComponent()) .name; diff --git a/angularjs/src/lib/components/spinner/spinner.component.ts b/angularjs/src/lib/components/spinner/spinner.component.ts index b5e15c4672..b9882bc13e 100644 --- a/angularjs/src/lib/components/spinner/spinner.component.ts +++ b/angularjs/src/lib/components/spinner/spinner.component.ts @@ -7,37 +7,37 @@ * @hidecode true * * @html -
-+ -Default
-cs-spinner+ +-Default
+md-spinner-Default
-cs-spinner size:20+ +-Default
+md-spinner size:20-Default
-cs-spinner size:28+ +-Default
+md-spinner size:28-Default
-cs-spinner size:36+ +-Default
+md-spinner size:36-Blue
-cs-spinner color:blue+ +-Blue
+md-spinner color:blue-Blue
-cs-spinner size:20 color:blue+ +-Blue
+md-spinner size:20 color:blue-Blue
-cs-spinner size:28 color:blue+ +-Blue
+md-spinner size:28 color:blue-diff --git a/core/scss/typography/examples/links.html b/core/scss/typography/examples/links.html index 56b5b793e2..a47e32ca1d 100644 --- a/core/scss/typography/examples/links.html +++ b/core/scss/typography/examples/links.html @@ -1 +1 @@ -Blue
-cs-spinner size:36 color:blue+ +* * diff --git a/angularjs/src/lib/components/tabs/index.ts b/angularjs/src/lib/components/tabs/index.ts index b58b03c82e..29e847692b 100644 --- a/angularjs/src/lib/components/tabs/index.ts +++ b/angularjs/src/lib/components/tabs/index.ts @@ -7,7 +7,7 @@ import { tabContentTransclude, } from './tabs.component'; -export default angular.module('collab.ui.tabs', []) +export default angular.module('momentum.ui.tabs', []) .controller('TabsetController', TabsetController) .directive('tabset', tabset) .directive('tab', tab) diff --git a/angularjs/src/lib/components/tabs/tabs.component.ts b/angularjs/src/lib/components/tabs/tabs.component.ts index 3a54924ef1..e5c6a76c99 100644 --- a/angularjs/src/lib/components/tabs/tabs.component.ts +++ b/angularjs/src/lib/components/tabs/tabs.component.ts @@ -380,47 +380,47 @@ export function tabContentTransclude() { * @section small * * @html -Blue
+md-spinner size:36 color:blue- + +- -Small tab 1 ++ + Small tab 1 content-- -Small tab 2 + ++ Small tab 2 content 2-- -Small tab 3 + ++ Small tab 3 content 3-
-- + + * */ @@ -432,47 +432,47 @@ export function tabContentTransclude() { * @section gray * * @html -- -Small tab 1 ++ + Small tab 1 content-- -Small tab 2 + ++ Small tab 2 content 2-- -Small tab 3 + ++ Small tab 3 content 3-- + +- -Gray tab 1 ++ + Gray tab 1 content-- -Gray tab 2 + ++ Gray tab 2 content 2-- -Gray tab 3 + ++ Gray tab 3 content 3-
-- + + * */ @@ -484,47 +484,47 @@ export function tabContentTransclude() { * @section large * * @html -- -Gray tab 1 ++ + Gray tab 1 content-- -Gray tab 2 + ++ Gray tab 2 content 2-- -Gray tab 3 + ++ Gray tab 3 content 3-- + +- -Large tab 1 +345+ + Large tab 1 345content-- -Large tab 2 + ++ Large tab 2 content 2-- -Large tab 3 + +435456+ Large tab 3 435456content 3-
-- + + * */ diff --git a/angularjs/src/lib/components/toggleswitch/index.ts b/angularjs/src/lib/components/toggleswitch/index.ts index d0826a70b7..96d19cc677 100644 --- a/angularjs/src/lib/components/toggleswitch/index.ts +++ b/angularjs/src/lib/components/toggleswitch/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { csToggleSwitch } from './toggleswitch.component'; +import { mdToggleSwitch } from './toggleswitch.component'; export default angular - .module('collab.ui.toggleswitch', []) - .directive('csToggleSwitch', csToggleSwitch) + .module('momentum.ui.toggleswitch', []) + .directive('mdToggleSwitch', mdToggleSwitch) .name; diff --git a/angularjs/src/lib/components/toggleswitch/toggleswitch.component.ts b/angularjs/src/lib/components/toggleswitch/toggleswitch.component.ts index 7563d141e8..728909d0d1 100644 --- a/angularjs/src/lib/components/toggleswitch/toggleswitch.component.ts +++ b/angularjs/src/lib/components/toggleswitch/toggleswitch.component.ts @@ -2,7 +2,7 @@ * @category controls * @component toggle-switch */ -export function csToggleSwitch() { +export function mdToggleSwitch() { let directive = { restrict: 'E', replace: true, @@ -12,12 +12,12 @@ export function csToggleSwitch() { name: '@', ngModel: '=', isDisabled: '=', - csChange: '&', - csTrueValue: '@', - csFalseValue: '@', - csKeypressFn: '&?', - csAriaLabel: '@?', - csLabel: '@?', + mdChange: '&', + mdTrueValue: '@', + mdFalseValue: '@', + mdKeypressFn: '&?', + mdAriaLabel: '@?', + mdLabel: '@?', }, template: `- -Large tab 1 +345+ + Large tab 1 345content-- -Large tab 2 + ++ Large tab 2 content 2-- -Large tab 3 + +435456+ Large tab 3 435456content 3-@@ -28,21 +28,21 @@ export function csToggleSwitch() { name="{{name}}" id="{{id}}" ng-disabled="isDisabled" - ng-change="csChange({toggleValue: ngModel})" - ng-true-value="{{csTrueValue || true}}" - ng-false-value="{{csFalseValue || false}}" - aria-label="{{::csAriaLabel}}" + ng-change="mdChange({toggleValue: ngModel})" + ng-true-value="{{mdTrueValue || true}}" + ng-false-value="{{mdFalseValue || false}}" + aria-label="{{::mdAriaLabel}}" ng-keydown="keypressFn($event)">`, link: function (scope) { scope.keypressFn = function ($event) { - if (scope.csKeypressFn) { - scope.csKeypressFn({ $event: $event }); + if (scope.mdKeypressFn) { + scope.mdKeypressFn({ $event: $event }); } }; }, @@ -60,12 +60,12 @@ export function csToggleSwitch() { * * @html -- + md-label="Label"> + **/ /** @@ -78,11 +78,11 @@ export function csToggleSwitch() { * * @html -- + md-label="Label"> + **/ diff --git a/angularjs/src/lib/components/tokenfield/index.ts b/angularjs/src/lib/components/tokenfield/index.ts index c4d2b24146..70043f7998 100644 --- a/angularjs/src/lib/components/tokenfield/index.ts +++ b/angularjs/src/lib/components/tokenfield/index.ts @@ -1,6 +1,6 @@ import * as angular from 'angular'; import { TokenField } from './tokenfield.component'; -export default angular.module('collab.ui.tokenfield', []) - .directive('csTokenField', TokenField.factory) +export default angular.module('momentum.ui.tokenfield', []) + .directive('mdTokenField', TokenField.factory) .name; diff --git a/angularjs/src/lib/components/topbar/index.ts b/angularjs/src/lib/components/topbar/index.ts index e6f40de864..8c918c8408 100644 --- a/angularjs/src/lib/components/topbar/index.ts +++ b/angularjs/src/lib/components/topbar/index.ts @@ -2,6 +2,6 @@ import * as angular from 'angular'; import { TopbarComponent } from './topbar.component'; export default angular - .module('collab.ui.topbar', []) - .component('csTopBar', new TopbarComponent()) + .module('momentum.ui.topbar', []) + .component('mdTopBar', new TopbarComponent()) .name; diff --git a/angularjs/src/lib/components/topbar/topbar.component.ts b/angularjs/src/lib/components/topbar/topbar.component.ts index 88a5a390b6..369b485a1a 100644 --- a/angularjs/src/lib/components/topbar/topbar.component.ts +++ b/angularjs/src/lib/components/topbar/topbar.component.ts @@ -39,8 +39,8 @@ export class TopbarComponent implements ng.IComponentOptions { }; public controller = Topbar; public transclude = { - topnav: '?csTopNav', - topbarright: '?csTopBarRight', + topnav: '?mdTopNav', + topbarright: '?mdTopBarRight', }; } diff --git a/angularjs/src/lib/components/topnav/index.ts b/angularjs/src/lib/components/topnav/index.ts index cda6042893..0c388b0717 100644 --- a/angularjs/src/lib/components/topnav/index.ts +++ b/angularjs/src/lib/components/topnav/index.ts @@ -2,6 +2,6 @@ import * as angular from 'angular'; import { TopNavComponent } from './topnav.component'; export default angular - .module('collab.ui.topnav', []) - .component('csTopNav', new TopNavComponent()) + .module('momentum.ui.topnav', []) + .component('mdTopNav', new TopNavComponent()) .name; diff --git a/angularjs/src/lib/directives/bindHtmlUnsafe/index.ts b/angularjs/src/lib/directives/bindHtmlUnsafe/index.ts index 54dd020833..3d1cb2e218 100644 --- a/angularjs/src/lib/directives/bindHtmlUnsafe/index.ts +++ b/angularjs/src/lib/directives/bindHtmlUnsafe/index.ts @@ -2,6 +2,6 @@ import * as angular from 'angular'; import { BindHtmlUnsafeDirective } from './bindHtmlUnsafe.directive'; export default angular - .module('collab.ui.bindHtml', []) - .directive('csBindHtmlUnsafe', BindHtmlUnsafeDirective.factory()) + .module('momentum.ui.bindHtml', []) + .directive('mdBindHtmlUnsafe', BindHtmlUnsafeDirective.factory()) .name; diff --git a/angularjs/src/lib/directives/breakpoint/breakpoint.directive.ts b/angularjs/src/lib/directives/breakpoint/breakpoint.directive.ts index af18ee32f8..a10c99e7e5 100644 --- a/angularjs/src/lib/directives/breakpoint/breakpoint.directive.ts +++ b/angularjs/src/lib/directives/breakpoint/breakpoint.directive.ts @@ -4,8 +4,8 @@ export interface IBreakpointRootScopeService extends ng.IRootScopeService { breakpoint: string; } -csBreakpoint.$inject = ['$window', '$rootScope']; -export function csBreakpoint($window, $rootScope) { +mdBreakpoint.$inject = ['$window', '$rootScope']; +export function mdBreakpoint($window, $rootScope) { let directive = { restrict: 'A', link: link, @@ -13,21 +13,21 @@ export function csBreakpoint($window, $rootScope) { function link(scope, element, attr) { $rootScope.breakpoint = ''; - scope.csBreakpoint = { + scope.mdBreakpoint = { class: '', windowSize: $window.innerWidth, }; // Initialise Values - let csBreakpoints = (scope.$eval(attr.csBreakpoint)); + let mdBreakpoints = (scope.$eval(attr.mdBreakpoint)); let firstTime = true; angular.element($window).bind('resize', setWindowSize); - scope.$watch('csBreakpoint.windowSize', function (windowWidth, oldValue) { + scope.$watch('mdBreakpoint.windowSize', function (windowWidth, oldValue) { setClass(windowWidth); }); - scope.$watch('csBreakpoint.class', function (newClass, oldClass) { + scope.$watch('mdBreakpoint.class', function (newClass, oldClass) { if (newClass !== oldClass || firstTime) { broadcastEvent(oldClass); firstTime = false; @@ -35,28 +35,28 @@ export function csBreakpoint($window, $rootScope) { }); function broadcastEvent(oldClass) { - $rootScope.$broadcast('csBreakpointChange', scope.csBreakpoint, oldClass); + $rootScope.$broadcast('mdBreakpointChange', scope.mdBreakpoint, oldClass); } function setWindowSize() { - scope.csBreakpoint.windowSize = $window.innerWidth; + scope.mdBreakpoint.windowSize = $window.innerWidth; if (!scope.$$phase) { scope.$apply(); } } function setClass(windowWidth) { - let classSet = csBreakpoints[Object.keys(csBreakpoints)[0]]; - for (let csBreakpoint in csBreakpoints) { - if (csBreakpoints.hasOwnProperty(csBreakpoint)) { - if (csBreakpoint < windowWidth) { - classSet = csBreakpoints[csBreakpoint]; + let classSet = mdBreakpoints[Object.keys(mdBreakpoints)[0]]; + for (let mdBreakpoint in mdBreakpoints) { + if (mdBreakpoints.hasOwnProperty(mdBreakpoint)) { + if (mdBreakpoint < windowWidth) { + classSet = mdBreakpoints[mdBreakpoint]; } - element.removeClass(csBreakpoints[csBreakpoint]); + element.removeClass(mdBreakpoints[mdBreakpoint]); } } element.addClass(classSet); - scope.csBreakpoint.class = classSet; + scope.mdBreakpoint.class = classSet; $rootScope.breakpoint = classSet; if (!scope.$$phase) { scope.$apply(); diff --git a/angularjs/src/lib/directives/breakpoint/index.ts b/angularjs/src/lib/directives/breakpoint/index.ts index 09bddc3591..24bd214c56 100644 --- a/angularjs/src/lib/directives/breakpoint/index.ts +++ b/angularjs/src/lib/directives/breakpoint/index.ts @@ -1,9 +1,9 @@ import * as angular from 'angular'; -import { csBreakpoint } from './breakpoint.directive'; +import { mdBreakpoint } from './breakpoint.directive'; export * from './breakpoint.directive'; export default angular - .module('collab.ui.breakpoint', []) - .directive('csBreakpoint', csBreakpoint) + .module('momentum.ui.breakpoint', []) + .directive('mdBreakpoint', mdBreakpoint) .name; diff --git a/angularjs/src/lib/directives/buttons/button.directive.ts b/angularjs/src/lib/directives/buttons/button.directive.ts index 6435761a37..fd2824bebc 100644 --- a/angularjs/src/lib/directives/buttons/button.directive.ts +++ b/angularjs/src/lib/directives/buttons/button.directive.ts @@ -7,13 +7,13 @@ * @section loading * * @html -* +* * -* +* * -* +* * -* +* * * * @@ -22,8 +22,8 @@ * */ -export function csBtn() { - let csBtnDirective = { +export function mdBtn() { + let mdBtnDirective = { restrict: 'EA', transclude: true, replace: false, @@ -43,13 +43,13 @@ export function csBtn() { elem.addClass('md-button'); scope.$watch('loading', function(newValue, oldValue) { if (newValue) { - let width = $(elem).css('width'); + let width = $(elem).foobar('width'); scope.isLoading = true; - elem.css('width', width); + elem.foobar('width', width); elem.attr('disabled', 'disabled'); } else if (newValue === false) { scope.isLoading = false; - elem.css('width', ''); // remove the width style instead of overwriting it + elem.foobar('width', ''); // remove the width style instead of overwriting it if (!scope.ngDisabled) { elem.removeAttr('disabled'); } @@ -58,5 +58,5 @@ export function csBtn() { }, }; - return csBtnDirective; + return mdBtnDirective; } diff --git a/angularjs/src/lib/directives/buttons/index.ts b/angularjs/src/lib/directives/buttons/index.ts index 0ff63a28c6..f2718fc599 100644 --- a/angularjs/src/lib/directives/buttons/index.ts +++ b/angularjs/src/lib/directives/buttons/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { csBtn } from './button.directive'; +import { mdBtn } from './button.directive'; export default angular - .module('collab.ui.buttons', []) - .directive('csBtn', csBtn) + .module('momentum.ui.buttons', []) + .directive('mdBtn', mdBtn) .name; diff --git a/angularjs/src/lib/directives/collapse/collapse.directive.ts b/angularjs/src/lib/directives/collapse/collapse.directive.ts index 956bcc8fe7..062796088e 100644 --- a/angularjs/src/lib/directives/collapse/collapse.directive.ts +++ b/angularjs/src/lib/directives/collapse/collapse.directive.ts @@ -1,6 +1,6 @@ /** * @name Collapse Directive -* @description Provides a simple way to hide and show an element with a css transition. +* @description Provides a simple way to hide and show an element with a foobar transition. * * @html *@@ -22,13 +22,13 @@ * vm.isCollapsed = true; * } * -* @param cs-collapse - expand or collapse (expression) +* @param md-collapse - expand or collapse (expression) * */ -csCollapse.$inject = ['$animate', '$q', '$parse', '$injector']; -export function csCollapse($animate, $q, $parse, $injector) { - let $animateCss = $injector.has('$animateCss') ? $injector.get('$animateCss') : null; +mdCollapse.$inject = ['$animate', '$q', '$parse', '$injector']; +export function mdCollapse($animate, $q, $parse, $injector) { + let $animateFoobar = $injector.has('$animateFoobar') ? $injector.get('$animateFoobar') : null; return { link: function(scope, element, attrs) { let expandingExpr = $parse(attrs.expanding), @@ -41,7 +41,7 @@ export function csCollapse($animate, $q, $parse, $injector) { .addClass('collapse') .attr('aria-expanded', true) .attr('aria-hidden', false) - .css({ height: 'auto' }); + .foobar({ height: 'auto' }); } function expand() { @@ -56,8 +56,8 @@ export function csCollapse($animate, $q, $parse, $injector) { .attr('aria-expanded', true) .attr('aria-hidden', false); - if ($animateCss) { - $animateCss(element, { + if ($animateFoobar) { + $animateFoobar(element, { addClass: 'in', easing: 'ease', to: { height: element[0].scrollHeight + 'px' }, @@ -73,7 +73,7 @@ export function csCollapse($animate, $q, $parse, $injector) { function expandDone() { element.removeClass('collapsing') .addClass('collapse') - .css({ height: 'auto' }); + .foobar({ height: 'auto' }); expandedExpr(scope); } @@ -88,7 +88,7 @@ export function csCollapse($animate, $q, $parse, $injector) { // IMPORTANT: The height must be set before adding "collapsing" class. // Otherwise, the browser attempts to animate from height 0 (in // collapsing class) to the given height here. - .css({ height: element[0].scrollHeight + 'px' }) + .foobar({ height: element[0].scrollHeight + 'px' }) // initially all panel collapse have the collapse class, this removal // prevents the animation from jumping to collapsed state .removeClass('collapse') @@ -96,8 +96,8 @@ export function csCollapse($animate, $q, $parse, $injector) { .attr('aria-expanded', false) .attr('aria-hidden', true); - if ($animateCss) { - $animateCss(element, { + if ($animateFoobar) { + $animateFoobar(element, { removeClass: 'in', to: { height: '0' }, }).start()['finally'](collapseDone); @@ -110,7 +110,7 @@ export function csCollapse($animate, $q, $parse, $injector) { } function collapseDone() { - element.css({ height: '0' }); // Required so that collapse works when animation is disabled + element.foobar({ height: '0' }); // Required so that collapse works when animation is disabled element.removeClass('collapsing') .addClass('collapse'); collapsedExpr(scope); diff --git a/angularjs/src/lib/directives/collapse/index.ts b/angularjs/src/lib/directives/collapse/index.ts index 35640e7640..ebe68ec9a6 100644 --- a/angularjs/src/lib/directives/collapse/index.ts +++ b/angularjs/src/lib/directives/collapse/index.ts @@ -1,10 +1,10 @@ import * as angular from 'angular'; -import { csCollapse } from './collapse.directive'; -import CsTransition from '../../services/transition'; +import { mdCollapse } from './collapse.directive'; +import MdTransition from '../../services/transition'; export default angular - .module('collab.ui.collapse', [ - CsTransition, + .module('momentum.ui.collapse', [ + MdTransition, ]) - .directive('collapse', csCollapse) + .directive('collapse', mdCollapse) .name; diff --git a/angularjs/src/lib/directives/dropdown/dropdown.directive.ts b/angularjs/src/lib/directives/dropdown/dropdown.directive.ts index bd94f7e6f6..bee39d8379 100644 --- a/angularjs/src/lib/directives/dropdown/dropdown.directive.ts +++ b/angularjs/src/lib/directives/dropdown/dropdown.directive.ts @@ -1,8 +1,8 @@ import * as angular from 'angular'; import * as _ from 'lodash'; import { KeyCodes } from './keyCodes'; -csDropdownService.$inject = ['$document', '$rootScope']; -export function csDropdownService($document, $rootScope) { +mdDropdownService.$inject = ['$document', '$rootScope']; +export function mdDropdownService($document, $rootScope) { let openScope = null; let closeDropdown = function (evt) { @@ -111,8 +111,8 @@ export function csDropdownService($document, $rootScope) { }; } -CsDropdownController.$inject = ['$scope', '$element', '$attrs', '$parse', 'csDropdownConfig', 'csDropdownService', '$animate', '$position', '$document', '$compile', '$templateRequest', '$timeout']; -export function CsDropdownController($scope, $element, $attrs, $parse, dropdownConfig, csDropdownService, $animate, $position, $document, $compile, $templateRequest, $timeout) { +MdDropdownController.$inject = ['$scope', '$element', '$attrs', '$parse', 'mdDropdownConfig', 'mdDropdownService', '$animate', '$position', '$document', '$compile', '$templateRequest', '$timeout']; +export function MdDropdownController($scope, $element, $attrs, $parse, dropdownConfig, mdDropdownService, $animate, $position, $document, $compile, $templateRequest, $timeout) { let self = this, scope = $scope.$new(), // create a child scope so we are not polluting original one templateScope, @@ -191,7 +191,7 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC } let focus, prev, character, skip, match, isTypeable, preventDefault = true, ignore = false; focus = true; - isTypeable = $attrs.csTypeable === 'true'; + isTypeable = $attrs.mdTypeable === 'true'; switch (keyCode) { case (KeyCodes.BACKSPACE): ignore = true; @@ -269,14 +269,14 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC character = String.fromCharCode(keyCode); match = _filterMenuItems(elemsLi, character); } - if (match.length && this.csIsOpen) { + if (match.length && this.mdIsOpen) { this.previousFilter = character; this.active = match[0]; this.filterTimer = $timeout(() => { delete this.previousFilter; }, 1000); this.selectedOption = elemsLi.indexOf(this.active); - } else if (match.length && !this.csIsOpen) { + } else if (match.length && !this.mdIsOpen) { this.previousFilter = character; this.active = match[0]; this.filterTimer = $timeout(() => { @@ -309,7 +309,7 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC // arrow-key navigation with the menu closed should only happen in default or combo selects, or dropdowns // where the selected option is easily viewable - nested and multi selects are too complicated and regular // dropdowns do not necessarily places the selected option on view - if ($attrs.csKeyboardNav === 'true' && $attrs.csIsDisabled !== 'true') { + if ($attrs.mdKeyboardNav === 'true' && $attrs.mdIsDisabled !== 'true') { _focusDropdownEntry(e); } }; @@ -321,7 +321,7 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC $scope.$watch(getIsOpen, function (value) { scope.isOpen = !!value; - if ($attrs.csKeyboardNav === 'true') { + if ($attrs.mdKeyboardNav === 'true') { if (!scope.isOpen) { scope.selectedOption = void 0; let focussedItem = $element[0].querySelector('.hover'); @@ -394,8 +394,8 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC overflow = function (node) { let s = ''; ['overflow', 'overflow-y'].forEach(function (n) { - let css = getComputedStyle(node, null).getPropertyValue(n); - s += s.indexOf(css) === -1 ? css : ''; + let foobar = getComputedStyle(node, null).getPropertyValue(n); + s += s.indexOf(foobar) === -1 ? foobar : ''; }); return s; }; @@ -534,21 +534,21 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC $animate[isOpen ? 'addClass' : 'removeClass']($element, openClass); if (appendTo && self.dropdownMenu) { let pos = $position.positionElements($element, self.dropdownMenu, 'bottom-left', true), - css, + foobar, rightalign; - css = { + foobar = { top: pos.top + 'px', display: isOpen ? 'block' : 'none', }; rightalign = self.dropdownMenu.hasClass('dropdown-menu-right'); if (!rightalign) { - css.left = pos.left + 'px'; - css.right = 'auto'; + foobar.left = pos.left + 'px'; + foobar.right = 'auto'; } else { - css.left = 'auto'; - css.right = window.innerWidth - + foobar.left = 'auto'; + foobar.right = window.innerWidth - (pos.left + $element.prop('offsetWidth')) + 'px'; } @@ -557,17 +557,17 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC if (!appendToBody) { let appendOffset = $position.offset(appendTo); - css.top = pos.top - appendOffset.top + 'px'; + foobar.top = pos.top - appendOffset.top + 'px'; if (!rightalign) { - css.left = pos.left - appendOffset.left + 'px'; + foobar.left = pos.left - appendOffset.left + 'px'; } else { - css.right = window.innerWidth - + foobar.right = window.innerWidth - (pos.left - appendOffset.left + $element.prop('offsetWidth')) + 'px'; } } - self.dropdownMenu.css(css); + self.dropdownMenu.foobar(foobar); } let openContainer = appendTo ? appendTo : $element; @@ -593,9 +593,9 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC scope.focusToggleElement(); if ($element.hasClass('md-select-multi')) { - csDropdownService.open(scope, true); + mdDropdownService.open(scope, true); } else { - csDropdownService.open(scope); + mdDropdownService.open(scope); } } else { @@ -608,7 +608,7 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC self.dropdownMenu = newEl; } - csDropdownService.close(scope); + mdDropdownService.close(scope); scope.selectedOption = null; scope.selectedNestedOption = null; } @@ -637,9 +637,9 @@ export function CsDropdownController($scope, $element, $attrs, $parse, dropdownC } /* @ngInject */ -export function csDropdown($window) { +export function mdDropdown($window) { return { - controller: CsDropdownController, + controller: MdDropdownController, link: function (scope, element, attrs, dropdownCtrl) { dropdownCtrl.init(); @@ -656,10 +656,10 @@ export function csDropdown($window) { }; } -export function csDropdownMenu() { +export function mdDropdownMenu() { return { restrict: 'A', - require: '?^csDropdown', + require: '?^mdDropdown', link: function (scope, element, attrs, dropdownCtrl) { if (!dropdownCtrl || angular.isDefined(attrs.dropdownNested)) { return; @@ -679,9 +679,9 @@ export function csDropdownMenu() { }; } -export function csDropdownToggle() { +export function mdDropdownToggle() { return { - require: '?^csDropdown', + require: '?^mdDropdown', link: function (scope, element, attrs, dropdownCtrl) { if (!dropdownCtrl) { return; diff --git a/angularjs/src/lib/directives/dropdown/index.ts b/angularjs/src/lib/directives/dropdown/index.ts index de41f4a90a..713a467525 100644 --- a/angularjs/src/lib/directives/dropdown/index.ts +++ b/angularjs/src/lib/directives/dropdown/index.ts @@ -1,22 +1,22 @@ import * as angular from 'angular'; -import CsPosition from '../../services/position'; +import MdPosition from '../../services/position'; import { - csDropdown, - csDropdownService, - csDropdownToggle, - csDropdownMenu, + mdDropdown, + mdDropdownService, + mdDropdownToggle, + mdDropdownMenu, } from './dropdown.directive'; export default angular - .module('collab.ui.dropdown', [ - CsPosition, + .module('momentum.ui.dropdown', [ + MdPosition, ]) - .constant('csDropdownConfig', { + .constant('mdDropdownConfig', { appendToOpenClass: 'md-dropdown-open', openClass: 'open', }) - .service('csDropdownService', csDropdownService) - .directive('csDropdown', csDropdown) - .directive('csDropdownToggle', csDropdownToggle) - .directive('csDropdownMenu', csDropdownMenu) + .service('mdDropdownService', mdDropdownService) + .directive('mdDropdown', mdDropdown) + .directive('mdDropdownToggle', mdDropdownToggle) + .directive('mdDropdownMenu', mdDropdownMenu) .name; diff --git a/angularjs/src/lib/directives/errorpopover/errorpopover.directive.ts b/angularjs/src/lib/directives/errorpopover/errorpopover.directive.ts index 29c5c08c14..ad9b97feb5 100644 --- a/angularjs/src/lib/directives/errorpopover/errorpopover.directive.ts +++ b/angularjs/src/lib/directives/errorpopover/errorpopover.directive.ts @@ -1,7 +1,7 @@ -export function csErrorPopover() { +export function mdErrorPopover() { let directive = { restrict: 'AC', - controller: CsErrorPopoverCtrl, + controller: MdErrorPopoverCtrl, controllerAs: 'ep', bindToController: true, }; @@ -9,7 +9,7 @@ export function csErrorPopover() { return directive; } -export function CsErrorPopoverCtrl() { +export function MdErrorPopoverCtrl() { let vm = this; vm.errorPopoverOpen = false; diff --git a/angularjs/src/lib/directives/errorpopover/index.ts b/angularjs/src/lib/directives/errorpopover/index.ts index 35c3d99c9b..f1d133dde4 100644 --- a/angularjs/src/lib/directives/errorpopover/index.ts +++ b/angularjs/src/lib/directives/errorpopover/index.ts @@ -1,11 +1,11 @@ import * as angular from 'angular'; import { - csErrorPopover, - CsErrorPopoverCtrl, + mdErrorPopover, + MdErrorPopoverCtrl, } from './errorpopover.directive'; export default angular - .module('collab.ui.errorpopover', []) - .directive('errorPopover', csErrorPopover) - .controller('CsErrorPopoverCtrl', CsErrorPopoverCtrl) + .module('momentum.ui.errorpopover', []) + .directive('errorPopover', mdErrorPopover) + .controller('MdErrorPopoverCtrl', MdErrorPopoverCtrl) .name; diff --git a/angularjs/src/lib/directives/expandinginput/expandinginput.directive.ts b/angularjs/src/lib/directives/expandinginput/expandinginput.directive.ts index 3d690f4789..d23f9302f6 100644 --- a/angularjs/src/lib/directives/expandinginput/expandinginput.directive.ts +++ b/angularjs/src/lib/directives/expandinginput/expandinginput.directive.ts @@ -1,29 +1,29 @@ import * as angular from 'angular'; -export function csExpandinginputCtrl() { +export function mdExpandinginputCtrl() { let vm = this; vm.elemIsInFocus = false; } -csExpandinginput.$inject = ['$timeout']; -export function csExpandinginput($timeout) { +mdExpandinginput.$inject = ['$timeout']; +export function mdExpandinginput($timeout) { let directive = { scope: { model: '=ngModel', focusWidth: '=', }, restrict: 'A', - controller: csExpandinginputCtrl, - controllerAs: 'csExpandinginput', + controller: mdExpandinginputCtrl, + controllerAs: 'mdExpandinginput', bindToController: true, link: function postLink(scope, element, attrs) { let wrapper = angular.element(''); let mirror = angular.element(''); - let defaultMaxwidth = element.css('maxWidth') === 'none' ? element.parent().innerWidth() : element.css('maxWidth'); - element.css('minWidth', attrs.csExpandinginputMinwidth || element.css('minWidth')); - element.css('maxWidth', attrs.csExpandinginputMaxwidth || defaultMaxwidth); + let defaultMaxwidth = element.foobar('maxWidth') === 'none' ? element.parent().innerWidth() : element.foobar('maxWidth'); + element.foobar('minWidth', attrs.mdExpandinginputMinwidth || element.foobar('minWidth')); + element.foobar('maxWidth', attrs.mdExpandinginputMaxwidth || defaultMaxwidth); let elemIsInFocus; angular.forEach(['fontFamily', 'fontSize', 'fontWeight', 'fontStyle', @@ -31,7 +31,7 @@ export function csExpandinginput($timeout) { 'boxSizing', 'borderRightWidth', 'borderLeftWidth', 'borderLeftStyle', 'borderRightStyle', 'paddingLeft', 'paddingRight', 'marginLeft', 'marginRight', ], function (value) { - mirror.css(value, element.css(value)); + mirror.foobar(value, element.foobar(value)); }); angular.element('body').append(wrapper.append(mirror)); @@ -40,24 +40,24 @@ export function csExpandinginput($timeout) { mirror.text(element.val() || attrs.placeholder); // only change my width if I need to be wider if ((element.val() !== '') && (mirror.outerWidth() > attrs.focusWidth)) { - element.css('width', mirror.outerWidth() + 1); + element.foobar('width', mirror.outerWidth() + 1); } else if ((element.val() === '') && (elemIsInFocus === false)) { // reset me back to the original minwidth cause the box reset resetWidth(); } else { - element.css('width', attrs.focusWidth); + element.foobar('width', attrs.focusWidth); } } function changeWidthonFocus() { if ((attrs.focusWidth) && (element.val() === '')) { - element.css('width', attrs.focusWidth); + element.foobar('width', attrs.focusWidth); } } function resetWidth() { if (element.val() === '' && !elemIsInFocus) { - element.css('width', element.css('minWidth')); + element.foobar('width', element.foobar('minWidth')); } } diff --git a/angularjs/src/lib/directives/expandinginput/index.ts b/angularjs/src/lib/directives/expandinginput/index.ts index 0813e55aa2..bbc7cdbed6 100644 --- a/angularjs/src/lib/directives/expandinginput/index.ts +++ b/angularjs/src/lib/directives/expandinginput/index.ts @@ -1,11 +1,11 @@ import * as angular from 'angular'; import { - csExpandinginput, - csExpandinginputCtrl, + mdExpandinginput, + mdExpandinginputCtrl, } from './expandinginput.directive'; export default angular - .module('collab.ui.expandinginput', []) - .directive('csExpandinginput', csExpandinginput) - .controller('csExpandinginputCtrl', csExpandinginputCtrl) + .module('momentum.ui.expandinginput', []) + .directive('mdExpandinginput', mdExpandinginput) + .controller('mdExpandinginputCtrl', mdExpandinginputCtrl) .name; diff --git a/angularjs/src/lib/directives/index.ts b/angularjs/src/lib/directives/index.ts index a82013f487..39647ac537 100644 --- a/angularjs/src/lib/directives/index.ts +++ b/angularjs/src/lib/directives/index.ts @@ -1,21 +1,21 @@ import * as angular from 'angular'; // Import all directives -import csBindHtmlUnsafe from './bindHtmlUnsafe'; -import csBreakpoint from './breakpoint'; -import csBtn from './buttons'; -import csCollapse from './collapse'; -import csDropdown from './dropdown'; -import csErrorPopover from './errorpopover'; -import csExpandinginput from './expandinginput'; -import csInput from './input'; -import csLoader from './loader'; -import csPopover from './popover'; -import csSticky from './sticky'; -import csTimepicker from './timepicker'; -import csTooltip from './tooltip'; -import csTypeahead from './typeahead'; -import csWindowsize from './typeahead'; +import mdBindHtmlUnsafe from './bindHtmlUnsafe'; +import mdBreakpoint from './breakpoint'; +import mdBtn from './buttons'; +import mdCollapse from './collapse'; +import mdDropdown from './dropdown'; +import mdErrorPopover from './errorpopover'; +import mdExpandinginput from './expandinginput'; +import mdInput from './input'; +import mdLoader from './loader'; +import mdPopover from './popover'; +import mdSticky from './sticky'; +import mdTimepicker from './timepicker'; +import mdTooltip from './tooltip'; +import mdTypeahead from './typeahead'; +import mdWindowsize from './typeahead'; // Export all directives export * from './bindHtmlUnsafe'; @@ -38,20 +38,20 @@ export * from './typeahead'; export default angular .module('md.directives', [ - csBindHtmlUnsafe, - csBreakpoint, - csBtn, - csCollapse, - csDropdown, - csErrorPopover, - csExpandinginput, - csInput, - csLoader, - csPopover, - csSticky, - csTimepicker, - csTooltip, - csTypeahead, - csWindowsize, + mdBindHtmlUnsafe, + mdBreakpoint, + mdBtn, + mdCollapse, + mdDropdown, + mdErrorPopover, + mdExpandinginput, + mdInput, + mdLoader, + mdPopover, + mdSticky, + mdTimepicker, + mdTooltip, + mdTypeahead, + mdWindowsize, ]) .name; diff --git a/angularjs/src/lib/directives/input/index.ts b/angularjs/src/lib/directives/input/index.ts index 910320519b..bbc3c548e2 100644 --- a/angularjs/src/lib/directives/input/index.ts +++ b/angularjs/src/lib/directives/input/index.ts @@ -1,10 +1,10 @@ import * as angular from 'angular'; import * as ngMessages from 'angular-messages'; -import { csInput } from './input.directive'; +import { mdInput } from './input.directive'; export default angular - .module('collab.ui.input', [ + .module('momentum.ui.input', [ ngMessages || 'ngMessages', ]) - .directive('csInput', csInput) + .directive('mdInput', mdInput) .name; diff --git a/angularjs/src/lib/directives/input/input.directive.ts b/angularjs/src/lib/directives/input/input.directive.ts index 3d3dd67c01..808284dc9c 100644 --- a/angularjs/src/lib/directives/input/input.directive.ts +++ b/angularjs/src/lib/directives/input/input.directive.ts @@ -1,28 +1,28 @@ import * as _ from 'lodash'; -csInput.$inject = ['$compile', '$log', '$exceptionHandler']; -export function csInput($compile, $log, $exceptionHandler) { +mdInput.$inject = ['$compile', '$log', '$exceptionHandler']; +export function mdInput($compile, $log, $exceptionHandler) { let directive = { restrict: 'A', scope: { type: '@', - csToggle: '@?', + mdToggle: '@?', name: '@', id: '@', toggleSize: '@', - label: '@?csInputLabel', - groupSize: '@?csInputGroupSize', // Size class for outer md-input-group container - helpText: '@?csInputHelpText', // Text for help text - secondaryLabel: '@?csInputSecondaryLabel', // Secondary label text - size: '@?csInputSize', // Size class for input element - nested: '@?csInputNested', // Indent the input - messages: ''; } else { @@ -106,7 +106,7 @@ export function csInput($compile, $log, $exceptionHandler) { }); // Add the label element if specified - if (scope.label && !scope.csToggle) { + if (scope.label && !scope.mdToggle) { if (scope.type === 'checkbox' || scope.type === 'radio') { // Add labels AFTER checkboxes and radios @@ -121,7 +121,7 @@ export function csInput($compile, $log, $exceptionHandler) { iElement.before(compiledLabel); } - } else if (scope.type === 'checkbox' && scope.csToggle) { + } else if (scope.type === 'checkbox' && scope.mdToggle) { // Add md-toggle label if md-toggle-switch is true let label = ''; let compiledLabel = $compile(label)(scope); diff --git a/angularjs/src/lib/directives/loader/index.ts b/angularjs/src/lib/directives/loader/index.ts index b496c55125..4343ec5777 100644 --- a/angularjs/src/lib/directives/loader/index.ts +++ b/angularjs/src/lib/directives/loader/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { csLoader } from './loader.directive'; +import { mdLoader } from './loader.directive'; export default angular - .module('collab.ui.loader', []) - .directive('csLoader', csLoader) + .module('momentum.ui.loader', []) + .directive('mdLoader', mdLoader) .name; diff --git a/angularjs/src/lib/directives/loader/loader.directive.ts b/angularjs/src/lib/directives/loader/loader.directive.ts index c59ebad3bf..8887858d37 100644 --- a/angularjs/src/lib/directives/loader/loader.directive.ts +++ b/angularjs/src/lib/directives/loader/loader.directive.ts @@ -1,4 +1,4 @@ -export function csLoader() { +export function mdLoader() { let directive = { restrict: 'A', template: `diff --git a/angularjs/src/lib/directives/popover/index.ts b/angularjs/src/lib/directives/popover/index.ts index 56f1d8080b..ccde2df699 100644 --- a/angularjs/src/lib/directives/popover/index.ts +++ b/angularjs/src/lib/directives/popover/index.ts @@ -1,5 +1,5 @@ import * as angular from 'angular'; -import csTooltip from '../tooltip'; +import mdTooltip from '../tooltip'; import { popover, popoverTemplatePopup, @@ -10,8 +10,8 @@ import { } from './popover.directive'; export default angular - .module('collab.ui.popover', [ - csTooltip, + .module('momentum.ui.popover', [ + mdTooltip, ]) .directive('popover', popover) .directive('popoverTemplatePopup', popoverTemplatePopup) diff --git a/angularjs/src/lib/directives/sticky/index.ts b/angularjs/src/lib/directives/sticky/index.ts index e695c971dc..ec5a1be3c8 100644 --- a/angularjs/src/lib/directives/sticky/index.ts +++ b/angularjs/src/lib/directives/sticky/index.ts @@ -1,8 +1,8 @@ import * as angular from 'angular'; import { - csSticky, + mdSticky, } from './sticky.directive'; -export default angular.module('collab.ui.sticky', []) - .directive('csSticky', csSticky) +export default angular.module('momentum.ui.sticky', []) + .directive('mdSticky', mdSticky) .name; diff --git a/angularjs/src/lib/directives/sticky/sticky.directive.ts b/angularjs/src/lib/directives/sticky/sticky.directive.ts index 02743a867c..f1340cb005 100644 --- a/angularjs/src/lib/directives/sticky/sticky.directive.ts +++ b/angularjs/src/lib/directives/sticky/sticky.directive.ts @@ -7,7 +7,7 @@ * @section sticky * * @html -*+*diff --git a/core/scss/components/top-bar/examples/light.html b/core/scss/components/top-bar/examples/light.html index 3d207404f5..68fc4a2abe 100644 --- a/core/scss/components/top-bar/examples/light.html +++ b/core/scss/components/top-bar/examples/light.html @@ -4,10 +4,10 @@**Section Title
*Section Description. Curabitur lobortis id lorem id bibendum. Ut id consectetur magna. Quisque volutpat augue enim, pulvinar lobortis nibh lacinia at. Vestibulum nec erat ut mi sollicitudin porttitor id sit amet risus. Nam tempus vel odio vitae aliquam. In imperdiet eros id lacus vestibulum vestibulum. Suspendisse fermentum sem sagittis ante venenatis egestas quis vel justo. Maecenas semper suscipit nunc, sed aliquam sapien convallis eu. Nulla ut turpis in diam dapibus consequat.
@@ -19,7 +19,7 @@ */ /* @ngInject */ -export function csSticky() { +export function mdSticky() { return { restrict: 'A', link: function (scope, el, att, ngModel) { diff --git a/angularjs/src/lib/directives/timepicker/index.ts b/angularjs/src/lib/directives/timepicker/index.ts index 5be34e2e77..4eb56b7850 100644 --- a/angularjs/src/lib/directives/timepicker/index.ts +++ b/angularjs/src/lib/directives/timepicker/index.ts @@ -1,10 +1,10 @@ import * as angular from 'angular'; import * as ngMessages from 'angular-messages'; -import { csTimepicker } from './timepicker.directive'; +import { mdTimepicker } from './timepicker.directive'; export default angular - .module('collab.ui.timepicker', [ + .module('momentum.ui.timepicker', [ ngMessages || 'ngMessages', ]) - .directive('csTimepicker', csTimepicker) + .directive('mdTimepicker', mdTimepicker) .name; diff --git a/angularjs/src/lib/directives/timepicker/timepicker.directive.ts b/angularjs/src/lib/directives/timepicker/timepicker.directive.ts index 477d89e167..c89b61ef17 100644 --- a/angularjs/src/lib/directives/timepicker/timepicker.directive.ts +++ b/angularjs/src/lib/directives/timepicker/timepicker.directive.ts @@ -3,8 +3,8 @@ import { KeyCodes } from '../dropdown/keyCodes'; const moment = require('moment'); -csTimepicker.$inject = ['$document', '$window', '$timeout', '$compile', '$exceptionHandler', '$templateRequest']; -export function csTimepicker($document, $window, $timeout, $compile, $exceptionHandler, $templateRequest) { +mdTimepicker.$inject = ['$document', '$window', '$timeout', '$compile', '$exceptionHandler', '$templateRequest']; +export function mdTimepicker($document, $window, $timeout, $compile, $exceptionHandler, $templateRequest) { let directive = { restrict: 'AC', require: 'ngModel', @@ -19,15 +19,15 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH minutes: '@', meridian: '@', twentyfourhour: '@', - messages: '=?csTimepickerMessages', // Object containing validation key/value pairs, - label: '@?csTimepickerLabel', - groupSize: '@?csTimepickerGroupSize', // Size class for outer cs-timepicker-group container - helpText: '@?csTimepickerHelpText', // Text for help text - secondaryLabel: '@?csTimepickerSecondaryLabel', // Secondary label text - size: '@?csTimepickerSize', // Size class for input element - nested: '@?csTimepickerNested', // Indent the input - warning: '=?csTimepickerWarning', // Expression or Boolean to show warning message - warningMessage: '@?csTimepickerWarningMessage', // Warning message + messages: '=?mdTimepickerMessages', // Object containing validation key/value pairs, + label: '@?mdTimepickerLabel', + groupSize: '@?mdTimepickerGroupSize', // Size class for outer md-timepicker-group container + helpText: '@?mdTimepickerHelpText', // Text for help text + secondaryLabel: '@?mdTimepickerSecondaryLabel', // Secondary label text + size: '@?mdTimepickerSize', // Size class for input element + nested: '@?mdTimepickerNested', // Indent the input + warning: '=?mdTimepickerWarning', // Expression or Boolean to show warning message + warningMessage: '@?mdTimepickerWarningMessage', // Warning message }, compile: compile, }; @@ -62,7 +62,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH let type = scope.type; let show = scope.ngShow; let inputGroup = ''; - if (scope.csToggle && scope.type === 'checkbox') { + if (scope.mdToggle && scope.type === 'checkbox') { iElement.addClass('md-toggle__input'); inputGroup = ''; } else { @@ -100,7 +100,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH - + @@ -110,7 +110,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH - + @@ -119,7 +119,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH - + @@ -135,7 +135,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH // Convert the html to an actual DOM node let template = angular.element(html); // Add the custom timepicker attribute to the directive element - iElement.attr('cs-tp-name', 'time'); + iElement.attr('md-tp-name', 'time'); // Append it to the directive element iElement.after(template); // And let Angular $compile it @@ -218,7 +218,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH scope.selectedTime = moment([scope.hours, ':', scope.minutes, ' ', scope.meridian].join(''), scope.format).format(scope.format); } //Trigger ng-change for validation - iElement.parent().find('[cs-tp-name="time"]').val(scope.selectedTime); + iElement.parent().find('[md-tp-name="time"]').val(scope.selectedTime); iElement.trigger('change'); } }; @@ -347,13 +347,13 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH keydown: function (event) { if ((event.keyCode || event.which) === KeyCodes.TAB) { let tabindex = event.shiftKey ? '-1' : '0'; - iElement.parent().find('[cs-tp-name="time"]').attr('tabIndex', tabindex); + iElement.parent().find('[md-tp-name="time"]').attr('tabIndex', tabindex); } }, mousedown: function (event) { if (iElement !== event.target && !iElement.parent()[0].contains(event.target)) { scope.opened = false; - iElement.parent().find('[cs-tp-name="time"]').attr('tabIndex', '0'); + iElement.parent().find('[md-tp-name="time"]').attr('tabIndex', '0'); } }, }; @@ -384,7 +384,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH time: function (event) { scope.showTimepicker(); $timeout(function () { - iElement.parent().find('[cs-tp-name="hh"]').focus(); + iElement.parent().find('[md-tp-name="hh"]').focus(); }); }, hh: function (event) { @@ -471,7 +471,7 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH let bindEvents = function (obj, el) { el = el || iElement; el.on(Object.keys(obj).join(eventNs + ' ') + eventNs, function (event) { - let name = $(event.target).attr('cs-tp-name'); + let name = $(event.target).attr('md-tp-name'); if (obj[event.type] && typeof obj[event.type][name] === 'function') { scope.$apply(function (scope) { obj[event.type][name](event); @@ -487,9 +487,9 @@ export function csTimepicker($document, $window, $timeout, $compile, $exceptionH }; $timeout(function () { - bindEvents(keyActions, iElement.parent().find('[cs-tp-name]')); - bindEvents(mouseActions, iElement.parent().find('[cs-tp-name]')); - bindEvents(focusActions, iElement.parent().find('[cs-tp-name]')); + bindEvents(keyActions, iElement.parent().find('[md-tp-name]')); + bindEvents(mouseActions, iElement.parent().find('[md-tp-name]')); + bindEvents(focusActions, iElement.parent().find('[md-tp-name]')); }); } } diff --git a/angularjs/src/lib/directives/tooltip/index.ts b/angularjs/src/lib/directives/tooltip/index.ts index 3674e7717a..21f4684877 100644 --- a/angularjs/src/lib/directives/tooltip/index.ts +++ b/angularjs/src/lib/directives/tooltip/index.ts @@ -15,7 +15,7 @@ import { export * from './tooltip.directive'; -export default angular.module('collab.ui.tooltip', []) +export default angular.module('momentum.ui.tooltip', []) .directive('tooltip', tooltip) .directive('tooltipHtmlUnsafe', tooltipHtmlUnsafe) .directive('tooltipClasses', tooltipClasses) diff --git a/angularjs/src/lib/directives/tooltip/tooltip.directive.ts b/angularjs/src/lib/directives/tooltip/tooltip.directive.ts index 042b4f7c50..b801334c33 100644 --- a/angularjs/src/lib/directives/tooltip/tooltip.directive.ts +++ b/angularjs/src/lib/directives/tooltip/tooltip.directive.ts @@ -154,14 +154,14 @@ export class $tooltip implements ng.IServiceProvider { if (!positionTimeout) { positionTimeout = $timeout(() => { // Reset the positioning. - tooltip.css({ + tooltip.foobar({ top: 0, left: 0, }); // Now set the calculated positioning. let ttPosition = $position.positionElements(element, tooltip, ttScope.placement, appendToBody); - tooltip.css({ + tooltip.foobar({ top: ttPosition.top + 'px', left: ttPosition.left + 'px', visibility: 'visible', @@ -767,7 +767,7 @@ export function tooltipClasses($position) { * @description A lightweight, extensible directive for fancy tooltip creation. The tooltipdirective supports multiple placements, optional transition animation, and more. * * @html -+`; -csModalWindow.$inject = ['$modalStack', '$q', '$animate', '$animateCss', '$document']; -export function csModalWindow($modalStack, $q, $animate, $animateCss, $document) { +mdModalWindow.$inject = ['$modalStack', '$q', '$animate', '$animateFoobar', '$document']; +export function mdModalWindow($modalStack, $q, $animate, $animateFoobar, $document) { return { scope: { index: '@', @@ -108,14 +108,14 @@ export function csModalWindow($modalStack, $q, $animate, $animateCss, $document) let animationPromise = null; if (attrs.modalInClass) { - animationPromise = $animateCss(element, { + animationPromise = $animateFoobar(element, { addClass: attrs.modalInClass, }).start(); scope.$on($modalStack.NOW_CLOSING_EVENT, function (e, setIsAsync) { let done = setIsAsync(); - if ($animateCss) { - $animateCss(element, { + if ($animateFoobar) { + $animateFoobar(element, { removeClass: attrs.modalInClass, }).start().then(done); } else { @@ -153,9 +153,9 @@ export function csModalWindow($modalStack, $q, $animate, $animateCss, $document) let _diffScroll = _initialScrollDiff - _finalScrollDiff; let _scrollTop = $('.md-modal').scrollTop(); if (_scrollTop <= (_initialScrollDiff + 4)) { - $('.md-modal__title').css({ 'margin-top': _diffScroll - _scrollTop }); + $('.md-modal__title').foobar({ 'margin-top': _diffScroll - _scrollTop }); } else { - $('.md-modal__title').css({ 'margin-top': 4 }); + $('.md-modal__title').foobar({ 'margin-top': 4 }); } }); } @@ -165,7 +165,7 @@ export function csModalWindow($modalStack, $q, $animate, $animateCss, $document) }; } -export function csModalAnimationClass() { +export function mdModalAnimationClass() { return { compile: function (tElement, tAttrs) { if (tAttrs.modalAnimation) { @@ -175,7 +175,7 @@ export function csModalAnimationClass() { }; } -export function csModalTransclude() { +export function mdModalTransclude() { return { link: function (scope, element, attrs, controller, transclude) { transclude(scope.$parent, function (clone) { @@ -186,8 +186,8 @@ export function csModalTransclude() { }; } -csModalStack.$inject = ['$animate', '$animateCss', '$compile', '$document', '$rootScope', '$q', '$$multiMap', '$$stackedMap']; -export function csModalStack($animate, $animateCss, $compile, $document, $rootScope, $q, $$multiMap, $$stackedMap) { +mdModalStack.$inject = ['$animate', '$animateFoobar', '$compile', '$document', '$rootScope', '$q', '$$multiMap', '$$stackedMap']; +export function mdModalStack($animate, $animateFoobar, $compile, $document, $rootScope, $q, $$multiMap, $$stackedMap) { let OPENED_MODAL_CLASS = 'modal-open'; let backdropDomEl, backdropScope; @@ -306,7 +306,7 @@ export function csModalStack($animate, $animateCss, $compile, $document, $rootSc } doneAnimating = true; - $animateCss(domEl, { + $animateFoobar(domEl, { event: 'leave', }).start().then(function () { domEl.remove(); @@ -533,15 +533,15 @@ export function csModalStack($animate, $animateCss, $compile, $document, $rootSc return $modalStack; } -export function csModal() { +export function mdModal() { let $modalProvider = { options: { animation: true, backdrop: 'static', //can also be true or 'static' keyboard: true, }, - $get: ['$rootScope', '$q', '$document', '$templateRequest', '$controller', '$csResolve', '$modalStack', - function ($rootScope, $q, $document, $templateRequest, $controller, $csResolve, $modalStack) { + $get: ['$rootScope', '$q', '$document', '$templateRequest', '$controller', '$mdResolve', '$modalStack', + function ($rootScope, $q, $document, $templateRequest, $controller, $mdResolve, $modalStack) { let $modal = { getPromiseChain: getPromiseChain, open: open, @@ -589,7 +589,7 @@ export function csModal() { } let templateAndResolvePromise = - $q.all([getTemplatePromise(modalOptions), $csResolve.resolve(modalOptions.resolve, {}, null, null)]); + $q.all([getTemplatePromise(modalOptions), $mdResolve.resolve(modalOptions.resolve, {}, null, null)]); function resolveWithTemplate() { return templateAndResolvePromise; diff --git a/angularjs/src/lib/services/multimap/index.ts b/angularjs/src/lib/services/multimap/index.ts index 745a09dde4..b307d2e32b 100644 --- a/angularjs/src/lib/services/multimap/index.ts +++ b/angularjs/src/lib/services/multimap/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { CsMultiMap } from './multimap.service'; +import { MdMultiMap } from './multimap.service'; export default angular - .module('collab.ui.multimap', []) - .factory('$$multiMap', CsMultiMap) + .module('momentum.ui.multimap', []) + .factory('$$multiMap', MdMultiMap) .name; diff --git a/angularjs/src/lib/services/multimap/multimap.service.ts b/angularjs/src/lib/services/multimap/multimap.service.ts index e44d2db6fb..fd7b488cda 100644 --- a/angularjs/src/lib/services/multimap/multimap.service.ts +++ b/angularjs/src/lib/services/multimap/multimap.service.ts @@ -1,7 +1,7 @@ /** * A helper, internal data structure that stores all references attached to key */ -export function CsMultiMap() { +export function MdMultiMap() { return { createNew: function() { let map = {}; diff --git a/angularjs/src/lib/services/position/index.ts b/angularjs/src/lib/services/position/index.ts index c47bb9582f..566b901dc2 100644 --- a/angularjs/src/lib/services/position/index.ts +++ b/angularjs/src/lib/services/position/index.ts @@ -2,6 +2,6 @@ import * as angular from 'angular'; import { $position } from './position.service'; export default angular - .module('collab.ui.position', []) + .module('momentum.ui.position', []) .factory('$position', $position) .name; diff --git a/angularjs/src/lib/services/position/position.service.ts b/angularjs/src/lib/services/position/position.service.ts index abe044a07f..5ef420d13a 100644 --- a/angularjs/src/lib/services/position/position.service.ts +++ b/angularjs/src/lib/services/position/position.service.ts @@ -366,7 +366,7 @@ export function $position($document, $window) { let targetHeight = angular.isDefined(targetElem.offsetHeight) ? targetElem.offsetHeight : targetElem.prop('offsetHeight'); placement = this.parsePlacement(placement); - let targetElementLeftMargin = parseInt(angular.element(hostElem).css('marginLeft'), 10); + let targetElementLeftMargin = parseInt(angular.element(hostElem).foobar('marginLeft'), 10); let hostElemPos = appendToBody ? this.offset(hostElem) : this.position(hostElem, true); let targetElemPos = { top: 0, left: 0, placement: '' }; @@ -483,7 +483,7 @@ export function $position($document, $window) { placement = this.parsePlacement(placement); if (placement[1] === 'center') { // no adjustment necessary - just reset styles - angular.element(arrowElem).css({ top: '', bottom: '', right: '', left: '', margin: '' }); + angular.element(arrowElem).foobar({ top: '', bottom: '', right: '', left: '', margin: '' }); return; } @@ -499,7 +499,7 @@ export function $position($document, $window) { borderRadiusProp += '-radius'; let borderRadius = $window.getComputedStyle(isTooltip ? innerElem : elem)[borderRadiusProp]; - let arrowCss = { + let arrowFoobar = { top: 'auto', bottom: 'auto', left: 'auto', @@ -509,22 +509,22 @@ export function $position($document, $window) { switch (placement[0]) { case 'top': - arrowCss.bottom = isTooltip ? '0' : '-' + borderWidth; + arrowFoobar.bottom = isTooltip ? '0' : '-' + borderWidth; break; case 'bottom': - arrowCss.top = isTooltip ? '0' : '-' + borderWidth; + arrowFoobar.top = isTooltip ? '0' : '-' + borderWidth; break; case 'left': - arrowCss.right = isTooltip ? '0' : '-' + borderWidth; + arrowFoobar.right = isTooltip ? '0' : '-' + borderWidth; break; case 'right': - arrowCss.left = isTooltip ? '0' : '-' + borderWidth; + arrowFoobar.left = isTooltip ? '0' : '-' + borderWidth; break; } - arrowCss[placement[1]] = borderRadius; + arrowFoobar[placement[1]] = borderRadius; - angular.element(arrowElem).css(arrowCss); + angular.element(arrowElem).foobar(arrowFoobar); }, }; } diff --git a/angularjs/src/lib/services/resolve/index.ts b/angularjs/src/lib/services/resolve/index.ts index eedcd1485c..ac51687407 100644 --- a/angularjs/src/lib/services/resolve/index.ts +++ b/angularjs/src/lib/services/resolve/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { CsResolve } from './resolve.service'; +import { MdResolve } from './resolve.service'; export default angular - .module('collab.ui.resolve', []) - .provider('$csResolve', CsResolve) + .module('momentum.ui.resolve', []) + .provider('$mdResolve', MdResolve) .name; diff --git a/angularjs/src/lib/services/resolve/resolve.service.ts b/angularjs/src/lib/services/resolve/resolve.service.ts index 891033ac24..e58d16058c 100644 --- a/angularjs/src/lib/services/resolve/resolve.service.ts +++ b/angularjs/src/lib/services/resolve/resolve.service.ts @@ -2,9 +2,9 @@ import * as angular from 'angular'; /** * Pluggable resolve mechanism for the modal resolve resolution - * Supports UI Router's $csResolve service + * Supports UI Router's $mdResolve service */ -export class CsResolve implements ng.IServiceProvider { +export class MdResolve implements ng.IServiceProvider { private resolver = null; public setResolver = (resolver) => { this.resolver = resolver; diff --git a/angularjs/src/lib/services/stackedmap/index.ts b/angularjs/src/lib/services/stackedmap/index.ts index f62e3b8c69..3811aeae73 100644 --- a/angularjs/src/lib/services/stackedmap/index.ts +++ b/angularjs/src/lib/services/stackedmap/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { CsStackedMap } from './stackedmap.service'; +import { MdStackedMap } from './stackedmap.service'; export default angular - .module('collab.ui.stackedmap', []) - .factory('$$stackedMap', CsStackedMap) + .module('momentum.ui.stackedmap', []) + .factory('$$stackedMap', MdStackedMap) .name; diff --git a/angularjs/src/lib/services/stackedmap/stackedmap.service.ts b/angularjs/src/lib/services/stackedmap/stackedmap.service.ts index 79ac3b1c28..3826115e3a 100644 --- a/angularjs/src/lib/services/stackedmap/stackedmap.service.ts +++ b/angularjs/src/lib/services/stackedmap/stackedmap.service.ts @@ -2,7 +2,7 @@ * A helper, internal data structure that acts as a map but also allows getting / removing * elements in the LIFO order */ -export function CsStackedMap() { +export function MdStackedMap() { return { createNew: function() { let stack = []; diff --git a/angularjs/src/lib/services/transition/index.ts b/angularjs/src/lib/services/transition/index.ts index 33dfbaba0c..ca230a8853 100644 --- a/angularjs/src/lib/services/transition/index.ts +++ b/angularjs/src/lib/services/transition/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { CsTransition } from './transition.service'; +import { MdTransition } from './transition.service'; export default angular - .module('collab.ui.transition', []) - .factory('$transition', CsTransition) + .module('momentum.ui.transition', []) + .factory('$transition', MdTransition) .name; diff --git a/angularjs/src/lib/services/transition/transition.service.ts b/angularjs/src/lib/services/transition/transition.service.ts index 4a8c434258..09dd9c74a6 100644 --- a/angularjs/src/lib/services/transition/transition.service.ts +++ b/angularjs/src/lib/services/transition/transition.service.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -CsTransition.$inject = ['$q', '$timeout', '$rootScope']; -export function CsTransition($q, $timeout, $rootScope) { +MdTransition.$inject = ['$q', '$timeout', '$rootScope']; +export function MdTransition($q, $timeout, $rootScope) { let $transition = function (element, trigger, options) { options = options || {}; @@ -56,7 +56,7 @@ export function CsTransition($q, $timeout, $rootScope) { } else if (angular.isFunction(trigger)) { trigger(element); } else if (angular.isObject(trigger)) { - element.css(trigger); + element.foobar(trigger); } //If browser does not support transitions, instantly resolve if (!endEventName) { diff --git a/angularjs/tools/docsCreate.js b/angularjs/tools/docsCreate.js index 7e15f966d8..477ccba120 100644 --- a/angularjs/tools/docsCreate.js +++ b/angularjs/tools/docsCreate.js @@ -1,8 +1,8 @@ -const mdUtils = require('@collabui/momentum-ui-utils'); -const collabUiData = require('@momentum-ui/core/data/docs.json') +const mdUtils = require('@momentum-ui/utils'); +const momentumUiData = require('@momentum-ui/core/data/domd.json') const glob = 'src/lib/**/*.ts'; -const path = 'src/docs/data/'; -const filename = `docs.json`; +const path = 'src/domd/data/'; +const filename = `domd.json`; -mdUtils.comments(glob, path, filename, collabUiData); +mdUtils.comments(glob, path, filename, momentumUiData); diff --git a/angularjs/tools/examplesCreate.js b/angularjs/tools/examplesCreate.js index a1ff56ee8f..66b1c72569 100644 --- a/angularjs/tools/examplesCreate.js +++ b/angularjs/tools/examplesCreate.js @@ -1,30 +1,30 @@ import fs from 'fs-extra'; import _ from 'lodash'; -import * as utils from '@collabui/momentum-ui-utils'; +import * as utils from '@momentum-ui/utils'; // JSON file including Navigation -import docs from '../src/docs/data/docs'; +import domd from '../src/domd/data/domd'; // Chalk Colors the Text // import { chalkError, chalkSuccess } from '../config/chalkConfig'; -// Root Directory of Docs Examples +// Root Directory of Domd Examples const argv = process.argv.slice(2)[0]; -const rootDir = `${argv || '.'}/src/docs/app/examples`; +const rootDir = `${argv || '.'}/src/domd/app/examples`; const ignoredCategories = [ 'overview', 'develop' ]; -export default function createExamples(docs) { +export default function createExamples(domd) { let componentContent = `import * as angular from 'angular';\n`; let angularModule = ` export default angular .module('examplesModule', [ - 'collab.ui', + 'momentum.ui', ])`; const fileEnd = `\n.name;`; - Object.keys(docs).forEach(async category => { + Object.keys(domd).forEach(async category => { if (_.includes(ignoredCategories, category)) return; - docs[category].children.forEach(async component => { + domd[category].children.forEach(async component => { if (!component.sections || !component.component) return; component.sections.forEach(async section => { if (!section.examples) return; @@ -56,7 +56,7 @@ export default angular (async () => { await utils.emptyDir(rootDir); - await createExamples(docs); + await createExamples(domd); })(); diff --git a/core/CONTRIBUTING.md b/core/CONTRIBUTING.md index 9e61be0215..684167acf2 100644 --- a/core/CONTRIBUTING.md +++ b/core/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing -##### We'd love for you to contribute to our source code and to make Collab UI even better than it is today! Here are the guidelines we'd like you to follow: +##### We'd love for you to contribute to our source code and to make Momentum UI even better than it is today! Here are the guidelines we'd like you to follow: ## Table of Contents diff --git a/core/GETTING-STARTED.md b/core/GETTING-STARTED.md index 816f7c637c..78f260cf58 100644 --- a/core/GETTING-STARTED.md +++ b/core/GETTING-STARTED.md @@ -1,10 +1,10 @@ ## Getting Started -#### An overview of the Collab UI Core, how to download and use, examples, and more. +#### An overview of the Momentum UI Core, how to download and use, examples, and more. ## Install with NPM or Yarn -Install and manage the Collab UI Core using NPM. You may use `yarn` or `npm`. By default, yarn/npm installs packages to node_modules/. +Install and manage the Momentum UI Core using NPM. You may use `yarn` or `npm`. By default, yarn/npm installs packages to node_modules/. `npm install @momentum-ui/core --save` diff --git a/core/README.md b/core/README.md index 046a714089..239cf0e2cd 100644 --- a/core/README.md +++ b/core/README.md @@ -1,4 +1,4 @@ -# Collab UI Core +# Momentum UI Core [](https://circleci.com/gh/momentum-ui/momentum-ui/)  @@ -7,7 +7,7 @@ > @momentum-ui/core -Collab UI Core is a UI framework for implementing Cisco Collaboration Design into web apps and sites. +Momentum UI Core is a UI framework for implementing Cisco Momentum Design into web apps and sites. ## Table of Contents @@ -18,7 +18,7 @@ Collab UI Core is a UI framework for implementing Cisco Collaboration Design int ## Install -Install and manage the Collab UI Core using NPM. You may use `yarn` or `npm`. By default, yarn/npm installs packages to node_modules/. +Install and manage the Momentum UI Core using NPM. You may use `yarn` or `npm`. By default, yarn/npm installs packages to node_modules/. `npm install @momentum-ui/core --save` diff --git a/core/app/index.ejs b/core/app/index.ejs index 642f82d1a8..73013333ab 100755 --- a/core/app/index.ejs +++ b/core/app/index.ejs @@ -17,7 +17,7 @@ -'); - inputsContainer.css('position', 'relative'); + inputsContainer.foobar('position', 'relative'); element.after(inputsContainer); hintInputElem = element.clone(); hintInputElem.attr('placeholder', ''); hintInputElem.attr('tabindex', '-1'); hintInputElem.val(''); - hintInputElem.css({ + hintInputElem.foobar({ position: 'absolute', top: '0px', left: '0px', @@ -179,7 +179,7 @@ export function CsTypeaheadController(originalScope, element, attrs, $compile, $ background: 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)', color: '#999', }); - element.css({ + element.foobar({ position: 'relative', 'vertical-align': 'top', 'background-color': 'transparent', @@ -635,7 +635,7 @@ export function CsTypeaheadController(originalScope, element, attrs, $compile, $ export function typeahead() { return { restrict: 'A', - controller: 'CsTypeaheadController', + controller: 'MdTypeaheadController', require: ['ngModel', '^?ngModelOptions', 'typeahead'], link: function (originalScope, element, attrs, ctrls) { ctrls[2].init(ctrls[0], ctrls[1]); diff --git a/angularjs/src/lib/directives/windowsize/index.ts b/angularjs/src/lib/directives/windowsize/index.ts index c3e4571718..0b9b368416 100644 --- a/angularjs/src/lib/directives/windowsize/index.ts +++ b/angularjs/src/lib/directives/windowsize/index.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { csWindowsize } from './windowsize.directive'; +import { mdWindowsize } from './windowsize.directive'; export default angular - .module('collab.ui.windowsize', []) - .directive('windowsize', csWindowsize) + .module('momentum.ui.windowsize', []) + .directive('windowsize', mdWindowsize) .name; diff --git a/angularjs/src/lib/directives/windowsize/windowsize.directive.ts b/angularjs/src/lib/directives/windowsize/windowsize.directive.ts index 1608eb5762..d572ec9aea 100644 --- a/angularjs/src/lib/directives/windowsize/windowsize.directive.ts +++ b/angularjs/src/lib/directives/windowsize/windowsize.directive.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -csWindowsize.$inject = ['$window']; -export function csWindowsize($window) { +mdWindowsize.$inject = ['$window']; +export function mdWindowsize($window) { return function (scope, element) { var w = $window; scope.getWindowDimensions = function () { diff --git a/angularjs/src/lib/momentum-ui-angularjs.ts b/angularjs/src/lib/momentum-ui-angularjs.ts index 4e348eec85..421c92e0ea 100644 --- a/angularjs/src/lib/momentum-ui-angularjs.ts +++ b/angularjs/src/lib/momentum-ui-angularjs.ts @@ -9,7 +9,7 @@ export * from './components'; export * from './services'; export default angular - .module('collab.ui', [ + .module('momentum.ui', [ CUI_DIRECTIVES, CUI_COMPONENTS, CUI_SERVICES, diff --git a/angularjs/src/lib/services/debounce/index.ts b/angularjs/src/lib/services/debounce/index.ts index 45a53b5c7f..be56f8ba4a 100644 --- a/angularjs/src/lib/services/debounce/index.ts +++ b/angularjs/src/lib/services/debounce/index.ts @@ -1,6 +1,6 @@ import * as angular from 'angular'; import { $$debounce } from './debounce.service'; -export default angular.module('collab.ui.debounce', []) +export default angular.module('momentum.ui.debounce', []) .factory('$$debounce', $$debounce) .name; diff --git a/angularjs/src/lib/services/dropdown/dropdown.service.ts b/angularjs/src/lib/services/dropdown/dropdown.service.ts index 36f8304c1e..35da25c805 100644 --- a/angularjs/src/lib/services/dropdown/dropdown.service.ts +++ b/angularjs/src/lib/services/dropdown/dropdown.service.ts @@ -31,8 +31,8 @@ export class DropdownService { overflow = function (node) { let s = ''; ['overflow', 'overflow-y'].forEach(function (n) { - let css = getComputedStyle(node, null).getPropertyValue(n); - s += s.indexOf(css) === -1 ? css : ''; + let foobar = getComputedStyle(node, null).getPropertyValue(n); + s += s.indexOf(foobar) === -1 ? foobar : ''; }); return s; }; diff --git a/angularjs/src/lib/services/dropdown/index.ts b/angularjs/src/lib/services/dropdown/index.ts index 8cb301a35f..2c2d037a07 100644 --- a/angularjs/src/lib/services/dropdown/index.ts +++ b/angularjs/src/lib/services/dropdown/index.ts @@ -7,6 +7,6 @@ export { KeyboardEventCodes, }; -export default angular.module('collab.ui.dropdown.service', []) +export default angular.module('momentum.ui.dropdown.service', []) .service('$dropdown', DropdownService) .name; diff --git a/angularjs/src/lib/services/index.ts b/angularjs/src/lib/services/index.ts index f99d9f70ae..3ba8cd9403 100644 --- a/angularjs/src/lib/services/index.ts +++ b/angularjs/src/lib/services/index.ts @@ -1,13 +1,13 @@ import * as angular from 'angular'; // Import all services -import CsDebounce from './debounce'; -import CsTransition from './transition'; -import CsPosition from './position'; -import CsStackedMap from './stackedmap'; -import CsMultiMap from './multimap'; -import CsResolve from './resolve'; -import csModal from './modal'; +import MdDebounce from './debounce'; +import MdTransition from './transition'; +import MdPosition from './position'; +import MdStackedMap from './stackedmap'; +import MdMultiMap from './multimap'; +import MdResolve from './resolve'; +import mdModal from './modal'; // Export all services export * from './debounce'; @@ -21,12 +21,12 @@ export * from './modal'; // Export convenience property export default angular .module('md.services', [ - CsDebounce, - CsTransition, - CsPosition, - CsStackedMap, - CsMultiMap, - CsResolve, - csModal, + MdDebounce, + MdTransition, + MdPosition, + MdStackedMap, + MdMultiMap, + MdResolve, + mdModal, ]) .name; diff --git a/angularjs/src/lib/services/modal/index.ts b/angularjs/src/lib/services/modal/index.ts index a359aed16d..1e49b2683a 100644 --- a/angularjs/src/lib/services/modal/index.ts +++ b/angularjs/src/lib/services/modal/index.ts @@ -1,25 +1,25 @@ import * as angular from 'angular'; -import CsMultiMap from '../../services/multimap'; -import CsStackedMap from '../../services/stackedmap'; -import CsResolve from '../../services/resolve'; +import MdMultiMap from '../../services/multimap'; +import MdStackedMap from '../../services/stackedmap'; +import MdResolve from '../../services/resolve'; import { - csModal, - csModalBackdrop, - csModalWindow, - csModalAnimationClass, - csModalTransclude, - csModalStack, + mdModal, + mdModalBackdrop, + mdModalWindow, + mdModalAnimationClass, + mdModalTransclude, + mdModalStack, } from './modal.component'; -export default angular.module('collab.ui.modal', [ - CsMultiMap, - CsStackedMap, - CsResolve, +export default angular.module('momentum.ui.modal', [ + MdMultiMap, + MdStackedMap, + MdResolve, ]) - .directive('modalBackdrop', csModalBackdrop) - .directive('modalWindow', csModalWindow) - .directive('modalAnimationClass', csModalAnimationClass) - .directive('modalTransclude', csModalTransclude) - .factory('$modalStack', csModalStack) - .provider('$modal', csModal) + .directive('modalBackdrop', mdModalBackdrop) + .directive('modalWindow', mdModalWindow) + .directive('modalAnimationClass', mdModalAnimationClass) + .directive('modalTransclude', mdModalTransclude) + .factory('$modalStack', mdModalStack) + .provider('$modal', mdModal) .name; diff --git a/angularjs/src/lib/services/modal/modal.component.ts b/angularjs/src/lib/services/modal/modal.component.ts index f5d7f37bde..2a13d2d15e 100644 --- a/angularjs/src/lib/services/modal/modal.component.ts +++ b/angularjs/src/lib/services/modal/modal.component.ts @@ -5,8 +5,8 @@ import * as angular from 'angular'; import { KeyCodes } from '../../directives/dropdown/keyCodes'; -csModalBackdrop.$inject = ['$animate', '$injector', '$modalStack']; -export function csModalBackdrop($animate, $injector, $modalStack) { +mdModalBackdrop.$inject = ['$animate', '$injector', '$modalStack']; +export function mdModalBackdrop($animate, $injector, $modalStack) { return { replace: true, template: ` @@ -58,8 +58,8 @@ const modalTemplate = `Default Tooltip
Tooltip diff --git a/angularjs/src/lib/directives/typeahead/index.ts b/angularjs/src/lib/directives/typeahead/index.ts index 9c14e091e1..22a20fc145 100644 --- a/angularjs/src/lib/directives/typeahead/index.ts +++ b/angularjs/src/lib/directives/typeahead/index.ts @@ -5,19 +5,19 @@ import { typeaheadPopup, typeaheadMatch, typeaheadHighlight, - CsTypeaheadController, + MdTypeaheadController, } from './typeahead.directive'; -import CsPosition from '../../services/position'; -import csBindHtmlUnsafe from '../bindHtmlUnsafe'; -import CsDebounce from '../../services/debounce'; +import MdPosition from '../../services/position'; +import mdBindHtmlUnsafe from '../bindHtmlUnsafe'; +import MdDebounce from '../../services/debounce'; -export default angular.module('collab.ui.typeahead', [ - CsPosition, - csBindHtmlUnsafe, - CsDebounce, +export default angular.module('momentum.ui.typeahead', [ + MdPosition, + mdBindHtmlUnsafe, + MdDebounce, ]) .factory('typeaheadParser', typeaheadParser) - .controller('CsTypeaheadController', CsTypeaheadController) + .controller('MdTypeaheadController', MdTypeaheadController) .directive('typeahead', typeahead) .directive('typeaheadPopup', typeaheadPopup) .directive('typeaheadMatch', typeaheadMatch) diff --git a/angularjs/src/lib/directives/typeahead/typeahead-popup.html b/angularjs/src/lib/directives/typeahead/typeahead-popup.html index 65820bcf0b..b6fcb8893f 100644 --- a/angularjs/src/lib/directives/typeahead/typeahead-popup.html +++ b/angularjs/src/lib/directives/typeahead/typeahead-popup.html @@ -1,5 +1,5 @@Collab UI React +Momentum UI React diff --git a/core/package.json b/core/package.json index 2f7d65faef..20067b8bef 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@momentum-ui/core", - "description": "Cisco Collab UI CSS Framework", + "description": "Cisco Momentum UI CSS Framework", "version": "13.1.1", "author": "Cisco Systems, Inc.", "contributors": [ @@ -14,7 +14,7 @@ "Webex", "Cisco Spark", "Spark UI", - "Collab UI", + "Momentum UI", "CSS", "Scss" ], diff --git a/core/scss/components/top-bar/examples/blue.html b/core/scss/components/top-bar/examples/blue.html index aeb7daa779..b42fbb0014 100644 --- a/core/scss/components/top-bar/examples/blue.html +++ b/core/scss/components/top-bar/examples/blue.html @@ -4,10 +4,10 @@- +-Collab UI+Momentum UI- +-Collab UI+Momentum UILearn more about Collab UI's global colors.
+Learn more about Momentum UI's global colors.
diff --git a/icons/README.md b/icons/README.md index de5c32c6bf..e8711d60ab 100644 --- a/icons/README.md +++ b/icons/README.md @@ -4,9 +4,9 @@  [](https://github.com/momentum-design/momentum-ui/blob/master/icons/LICENSE) -> Collab UI Icons +> Momentum UI Icons -Collab UI Icons is a full suite of the pictographic font and svg icons. +Momentum UI Icons is a full suite of the pictographic font and svg icons. ## Table of Contents @@ -22,7 +22,7 @@ Collab UI Icons is a full suite of the pictographic font and svg icons. ## Background -Collab UI Icons is a full suite of the pictographic icons for easy scalable vector graphics on websites and web applications, created and maintained by the Spark UI Design Language team. It contains the Scss, CSS, fonts and SVG files needed for implenting the icons indepented of any other framework. It is also consumed and published as part of the Collab UI Toolkit. +Momentum UI Icons is a full suite of the pictographic icons for easy scalable vector graphics on websites and web applications, created and maintained by the Spark UI Design Language team. It contains the Scss, CSS, fonts and SVG files needed for implenting the icons indepented of any other framework. It is also consumed and published as part of the Momentum UI Toolkit. ## Install @@ -63,13 +63,13 @@ or ### Basic Icons -You can place Collab UI Icons just about anywhere using the CSS Prefix `icon-` and the icon's name. Collab UI Icons is designed to be used with inline elements (we like the `` tag for brevity, but using a `` is more semantically correct). +You can place Momentum UI Icons just about anywhere using the CSS Prefix `icon-` and the icon's name. Momentum UI Icons is designed to be used with inline elements (we like the `` tag for brevity, but using a `` is more semantically correct). `` ### Icon Sizes -All of the Collab UI Icons are suffixed with their size. i.e. `icon-camera_16` The CSS will automatically size the icons according to this size. +All of the Momentum UI Icons are suffixed with their size. i.e. `icon-camera_16` The CSS will automatically size the icons according to this size. ### Fixed Width Icons diff --git a/icons/package.json b/icons/package.json index e31b09e67c..b7c56bfd53 100644 --- a/icons/package.json +++ b/icons/package.json @@ -1,7 +1,7 @@ { "name": "@momentum-ui/icons", "version": "4.20.0", - "description": "The Cisco Collab UI Icons library allows developers to easily incorporate Webex Icons and CSS into any application.", + "description": "The Cisco Momentum UI Icons library allows developers to easily incorporate Webex Icons and CSS into any application.", "homepage": "http://momentum.design/styles/icons", "keywords": [ "font", @@ -10,7 +10,7 @@ "Webex", "Cisco Spark", "Spark UI", - "Collab UI" + "Momentum UI" ], "style": "css/momentum-ui-icons.css", "main": "scss/momentum-ui-icons.scss", diff --git a/icons/templates/CollabIconType.swift.hbs b/icons/templates/CollabIconType.swift.hbs index 5008d81ab1..d75cad5e2b 100644 --- a/icons/templates/CollabIconType.swift.hbs +++ b/icons/templates/CollabIconType.swift.hbs @@ -1,6 +1,6 @@ import Foundation -@objc public enum CollabIconType: Int { +@objc public enum MomentumIconType: Int { // swiftlint:disable:next identifier_name case _invalid {{#each glyphsData}} diff --git a/react/CONTRIBUTING.md b/react/CONTRIBUTING.md index 69eb93bb65..36895378df 100644 --- a/react/CONTRIBUTING.md +++ b/react/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -##### We'd love for you to contribute to our source code and to make Collab UI React even better than it is today! Below are the guidelines to follow. +##### We'd love for you to contribute to our source code and to make Momentum UI React even better than it is today! Below are the guidelines to follow. ## Table of Contents @@ -73,7 +73,7 @@ All UI components of `momentum-ui-react` are unit-tested using two approaches: ### Components - * `Collab UI React` follows **components and their compositions** based architecture with focus on simplicity, flexibility and performance. + * `Momentum UI React` follows **components and their compositions** based architecture with focus on simplicity, flexibility and performance. * Only statefull components are implemented as subclass of `React.Component`. Others are simple stateless functions or PureComponents. @@ -106,7 +106,7 @@ let concatenatedvalue_wrong = 'Hello ' + name + ' everyone'; // ✕ * Avoid var to declare variables. * Use lowercase names for folder names and PascalCase for component folder names. -Please follow the coding style of the current code base. Collab UI React uses [eslint](http://eslint.org/) for ES6/JS and [stylelint](https://stylelint.io/) for scss/css, so if possible, enable linting in your editor to get realtime feedback. The linting rules can be run manually as below +Please follow the coding style of the current code base. Momentum UI React uses [eslint](http://eslint.org/) for ES6/JS and [stylelint](https://stylelint.io/) for scss/css, so if possible, enable linting in your editor to get realtime feedback. The linting rules can be run manually as below ```js npm run lint diff --git a/react/README.md b/react/README.md index 56aab81542..5d49fe8b1a 100644 --- a/react/README.md +++ b/react/README.md @@ -1,10 +1,10 @@ -# Collab UI React +# Momentum UI React [](https://circleci.com/gh/momentum-ui/momentum-ui/)  [](https://github.com/momentum-design/momentum-ui/blob/master/react/LICENSE) -**`Collab UI React`** is a resuable, component based, flexible React library available as +**`Momentum UI React`** is a resuable, component based, flexible React library available as npm module. It provides set of UI components and utilities based on [Momentum Design](https://momentum.design). The git repo can be cloned from [momentum-ui-react](https://github.com/momentum-design/momentum-ui-react) at [https://github.com/momentum-design/momentum-ui-react](https://github.com/momentum-design/momentum-ui-react). @@ -37,7 +37,7 @@ npm i -S @momentum-ui/react yarn install -S @momentum-ui/react ``` -### Step 2. Import Collab UI React components in your app +### Step 2. Import Momentum UI React components in your app Use ES6 import statement to import the component that you want to use: @@ -49,7 +49,7 @@ import Button from from '@momentum-ui/react/button'; ...- +``` @@ -65,7 +65,7 @@ import Button from from '@momentum-ui/react/button'; * [react-dom](https://github.com/facebook/react) - MIT -### Collaboration Design System Look & Feel +### Momentum Design System Look & Feel * [@momentum-ui/core](https://github.com/momentum-design/momentum-ui-core) - MIT * [@momentum-ui/icons](https://github.com/momentum-design/momentum-ui-icons) - MIT diff --git a/react/package.json b/react/package.json index 2da8bf879b..037ec6ddf4 100644 --- a/react/package.json +++ b/react/package.json @@ -1,7 +1,7 @@ { "name": "@momentum-ui/react", "version": "15.1.1", - "description": "Cisco Collab UI framework for ReactJs applications", + "description": "Cisco Momentum UI framework for ReactJs applications", "author": "Cisco Systems, Inc.", "contributors": [ "Paul JeterCollab UI React +Momentum UI React diff --git a/react/src/lib/Icon/tests/index.spec.js b/react/src/lib/Icon/tests/index.spec.js index 40c24547b4..5529fc331d 100644 --- a/react/src/lib/Icon/tests/index.spec.js +++ b/react/src/lib/Icon/tests/index.spec.js @@ -330,7 +330,7 @@ describe('Tests for', () => { }); }); - it('should log a warning if the icon does not exist in Collab UI Icons', () => { + it('should log a warning if the icon does not exist in Momentum UI Icons', () => { global.console = { warn: jest.fn() }; const props = { name: 'not-an-icon_16', diff --git a/react/src/lib/Tab/index.js b/react/src/lib/Tab/index.js index 75e3237f1b..f2a155bd5c 100644 --- a/react/src/lib/Tab/index.js +++ b/react/src/lib/Tab/index.js @@ -21,7 +21,7 @@ class Tab extends React.PureComponent { disabled } = this.props; - // Due to Collab UI must keep anchor element instead of button eventhough accessibility would like the anchor element to be switched to a button. + // Due to Momentum UI must keep anchor element instead of button eventhough accessibility would like the anchor element to be switched to a button. /* eslint-disable */ return ( - { const { heading, subHeading } = props; return ( - //Element type requires by UI-Collab Style + //Element type required by Momentum UI Style
{heading} {subHeading && {subHeading}} diff --git a/react/tools/nodeVersionCheck.js b/react/tools/nodeVersionCheck.js index 2d82e2ce98..e596ebc3a6 100644 --- a/react/tools/nodeVersionCheck.js +++ b/react/tools/nodeVersionCheck.js @@ -5,6 +5,6 @@ exec('node -v', function(err, stdout) { if (err) throw err; if (parseFloat(stdout.slice(1)) < 4) { - throw new Error('Collab-UI-React requires node 4.0 or greater.'); + throw new Error('@momentum-ui/react requires node 8.0 or greater.'); } }); diff --git a/utils/package.json b/utils/package.json index 7a9e0d762c..dd0b7dd67d 100644 --- a/utils/package.json +++ b/utils/package.json @@ -1,7 +1,7 @@ { "name": "@momentum-ui/utils", "version": "5.1.0", - "description": "Collab UI Utility functions.", + "description": "Momentum UI Utility functions.", "license": "MIT", "main": "index.js", "module": "index.js", diff --git a/www/README.md b/www/README.md index ecde65d5b2..35ea7f34e2 100644 --- a/www/README.md +++ b/www/README.md @@ -1 +1 @@ -# Collab Design Docs Site +# Momentum Design Docs Site diff --git a/www/tools/nodeVersionCheck.js b/www/tools/nodeVersionCheck.js index 95980c911b..117ffb2edd 100644 --- a/www/tools/nodeVersionCheck.js +++ b/www/tools/nodeVersionCheck.js @@ -5,6 +5,6 @@ exec('node -v', function (err, stdout) { if (err) throw err; if (parseFloat(stdout.slice(1)) < 6) { - throw new Error('Collab UI Starter React requires node 6.0 or greater.'); + throw new Error('Momentum UI Starter React requires node 6.0 or greater.'); } }); -
-
+