more cleanup plus settings

Author: ivansfdc

components/SLDSIcons.js

@@ -6,75 +6,83 @@ Redistributions in binary form must reproduce the above copyright notice, this l
 Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+'use strict';
 
 import React from 'react';
 
-export let ButtonIcon = React.createClass({
+import SLDSSettings from './SLDSSettings';
+
+
+export const ButtonIcon = React.createClass({
 
     getDefaultProps() {
+
         return {
-            category: "utility"
-        }
+            category: 'utility',
+        };
     },
 
+
     render() {
-        let useTag = '<use xlink:href="assets/icons/' + this.props.category + '-sprite/svg/symbols.svg#' + this.props.name + '" />';
-        let className  = "slds-button__icon";
+
+        const useTag = '<use xlink:href="'+SLDSSettings.getAssetsPath()+'/icons/' + this.props.category + '-sprite/svg/symbols.svg#' + this.props.name + '" />';
+        let className  = 'slds-button__icon';
         if (this.props.stateful) {
-            className += "--stateful";
+            className += '--stateful';
         }
         if (this.props.position) {
-            className = className + " slds-button__icon--" + this.props.position;
+            className = className + ' slds-button__icon--' + this.props.position;
         }
         if (this.props.size) {
-            className = className + " slds-button__icon--" + this.props.size;
+            className = className + ' slds-button__icon--' + this.props.size;
         }
         if (this.props.inverse) {
-            className = className + " slds-button__icon--inverse";
+            className = className + ' slds-button__icon--inverse';
         }
         if (this.props.hint) {
-            className = className + " slds-button__icon--hint";
+            className = className + ' slds-button__icon--hint';
         }
-        return <svg  aria-hidden="true" className={className} dangerouslySetInnerHTML={{__html: useTag }} />;
+        return <svg  aria-hidden='true' className={className} dangerouslySetInnerHTML={{__html: useTag }} />;
     }
 
 });
 
-export let Icon = React.createClass({
+export const Icon = React.createClass({
 
     getDefaultProps() {
         return {
-            category: "standard"
-        }
+            category: 'standard',
+        };
     },
 
     render() {
-        let useTag = '<use xlink:href="assets/icons/' + this.props.category + '-sprite/svg/symbols.svg#' + this.props.name + '" />';
-        let className  = "slds-icon";
+
+        const useTag = '<use xlink:href="'+SLDSSettings.getAssetsPath()+'/icons/' + this.props.category + '-sprite/svg/symbols.svg#' + this.props.name + '" />';
+        let className  = 'slds-icon';
         if (this.props.stateful) {
-            className += "--stateful";
+            className += '--stateful';
         }
         if (this.props.className) {
-            className += " " +this.props.className;
+            className += ' ' +this.props.className;
         }
         if (this.props.size) {
-            className += " slds-icon--" + this.props.size;
+            className += ' slds-icon--' + this.props.size;
         }
         if (this.props.position) {
-            className += " slds-icon--" + this.props.position;
+            className += ' slds-icon--' + this.props.position;
         }
-        className = className + " slds-icon-" + this.props.category + '-' + (this.props.theme || this.props.name);
-        return <span className="slds-icon__container"><svg aria-hidden="true" className={className} style={this.props.style} dangerouslySetInnerHTML={{__html: useTag }} /></span>;
+        className = className + ' slds-icon-' + this.props.category + '-' + (this.props.theme || this.props.name);
+        return <span className='slds-icon__container'><svg aria-hidden='true' className={className} style={this.props.style} dangerouslySetInnerHTML={{__html: useTag }} /></span>;
     }
 
 });
 
-export let InputIcon = React.createClass({
+export const InputIcon = React.createClass({
 
     render() {
-        let useTag = '<use xlink:href="assets/icons/utility-sprite/svg/symbols.svg#' + this.props.name + '" />';
-        let className  = "slds-input__icon slds-icon-text-default";
-        return <svg  aria-hidden="true" className={className} dangerouslySetInnerHTML={{__html: useTag }} />;
+        const useTag = '<use xlink:href="'+SLDSSettings.getAssetsPath()+'icons/utility-sprite/svg/symbols.svg#' + this.props.name + '" />';
+        const className  = 'slds-input__icon slds-icon-text-default';
+        return <svg  aria-hidden='true' className={className} dangerouslySetInnerHTML={{__html: useTag }} />;
     }
 
 });

components/SLDSPopover.js

@@ -11,7 +11,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 import React from "react";
 import TetherDrop from "tether-drop";
-import { TransitionSpring, Spring } from 'react-motion';
+//import { TransitionSpring, Spring } from 'react-motion';
 
 module.exports = React.createClass( {
 
@@ -80,15 +80,24 @@ module.exports = React.createClass( {
               float:'inherit',
               position:'inherit',
             }}>
-
+{/*
         <Spring 
           defaultValue={{ val:0 }}
           endValue={{ val:1, config: [70, 10] }}>
           {currentVal => {
-              return (<div style={{opacity:currentVal.val}}>{this.props.children}</div>);
+              return (<div style={{opacity:currentVal.val}}>
+
+*/}
+{
+                this.props.children
+              }
+{/*
+              </div>);
             }.bind(this)
           }
         </Spring>
+
+*/}
       </div>
     );
 

demo/slds/utils/index.js components/SLDSSettings.jsdemo/slds/utils/index.js renamed to components/SLDSSettings.js

@@ -11,12 +11,15 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 'use strict';
 
-import DateUtil from './DateUtil';
-import EventUtil from './EventUtil';
-import KEYS from './KEYS';
+let assetsPath = 'assets/';
 
 module.exports = {
-  DateUtil:DateUtil,
-  EventUtil:EventUtil,
-  KEYS:KEYS
+  setAssetsPath: (path)=>{
+    if(path){
+      assetsPath = path;
+    }
+  },
+  getAssetsPath: ()=>{
+    return String(assetsPath);
+  }
 };

components/index.js

@@ -1,5 +1,18 @@
+/*
+Copyright (c) 2015, salesforce.com, inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 import SLDSPicklistBase from './SLDSPicklistBase';
+import SLDSSettings from './SLDSSettings';
 
-export default {
-  SLDSPicklistBase: SLDSPicklistBase
+module.exports = {
+  SLDSPicklistBase: SLDSPicklistBase,
+  SLDSSettings: SLDSSettings
 };

demo/App.js

@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import SLDSDateInput from './slds/SLDSDateInput/index';
 import BaseLayout from './layout/base';
 
 import Router from 'react-router';