Merge pull request #156 from SassDoc/backport-fix-found-at

Backport, fixed `found-at` with absolute path

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.6
+
+* Backport, fixed `found-at` with absolute path ([#155](https://github.com/SassDoc/sassdoc/pull/155))
+
 ## 1.1.5
 
 * Fixed `@example` not being printed for variables ([#146](https://github.com/SassDoc/sassdoc/pull/146))

package.json

@@ -7,7 +7,7 @@
     { "name": "Valérian Galliat", "url": "https://twitter.com/valeriangalliat" },
     { "name": "Pascal Duez", "url": "https://twitter.com/pascalduez" }
   ],
-  "version": "1.1.5",
+  "version": "1.1.6",
   "license": {
     "type": "MIT",
     "url": "http://opensource.org/licenses/MIT"

src/file.js

@@ -161,7 +161,7 @@ exports = module.exports = {
         Object.keys(data).forEach(function (key) {
           data[key].forEach(function (item) {
             item.file = {
-              path: utils.getDisplayPath(file, exports.folder.base),
+              path: path.relative(exports.folder.base, file),
               name: path.basename(file, '.scss')
             };
           });
@@ -209,7 +209,7 @@ exports = module.exports = {
    * @param {String} folder - folder path
    */
   getData: function (folder) {
-    exports.folder.base = path.basename(folder);
+    exports.folder.base = folder;
 
     return exports.folder.parse(folder).then(function (response) {
       response = response || [];

src/utils.js

@@ -7,22 +7,12 @@ exports = module.exports = {
   /**
    * Get file extension
    * @param  {string} filename - filename to retrieve extension from
-   * @return {string}            extension
+   * @return {string} extension
    */
   getExtension: function (filename) {
     return path.extname(filename).substr(1);
   },
 
-  /**
-   * Get file display path, relative to the project directory
-   * @param  {string} filePath - file path
-   * @param  {string} baseDir  - project base directory
-   * @return {string}            display path
-   */
-  getDisplayPath: function (filePath, baseDir) {
-    return path.join(baseDir, filePath);
-  },
-
   /**
    * Get current date/time
    * @return {string} Stringified date time